Merge remote-tracking branch 'origin/master'

docs/admin/continuous.rst

@@ -35,8 +35,6 @@ And enable it's use by defining proper attributes in given repository (eg. in
     This merge driver assumes the changes in POT files always are done in branch
     we're trying to merge.
 
-.. seealso:: http://www.no-ack.org/2010/12/writing-git-merge-driver-for-po-files.html
-
 .. _push-changes:
 
 Pushing changes

weblate/html/translate.html

@@ -170,7 +170,7 @@
 {% if perms.trans.save_translation %}
 <div class="menu-float tooltip">
 <div class="tooltip-content">{% trans "Additional text to include in the commit message." %}</div>
-{% trans "Commit message:" %} <input type="text" name="commit_message" class="commit_message" value="{{ unit.translation.commit_message }}" />
+{% trans "Commit message:" %} <input type="text" name="commit_message" class="commit_message" tabindex="152" value="{{ unit.translation.commit_message }}" />
 </div>
 {% endif %}
 </td></tr>