Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Set version to 2.11.10
  Release notes for Gerrit 2.11.10
  Fix typo in 2.12.4 release notes

Change-Id: I79320f6b389a58bbccda59eeab4d142432fd89c4

ReleaseNotes/ReleaseNotes-2.11.10.txt

@@ -0,0 +1,30 @@
+Release notes for Gerrit 2.11.10
+================================
+
+Gerrit 2.11.10 is now available:
+
+link:https://gerrit-releases.storage.googleapis.com/gerrit-2.11.10.war[
+https://gerrit-releases.storage.googleapis.com/gerrit-2.11.10.war]
+
+There are no schema changes from link:ReleaseNotes-2.11.9.html[2.11.9].
+
+Bug Fixes
+---------
+
+* Fix synchronization of Myers diff and Histogram diff invocations.
++
+The fix for
+link:https://code.google.com/p/gerrit/issues/detail?id=3361[Issue 3361]
+that was included in Gerrit versions 2.10.7 and 2.11.4 introduced a
+regression that prevented more than one file header diff from being
+computed at the same time across the entire server.
+
+* Fix `sshd.idleTimeout` setting being ignored.
++
+The `sshd.idleTimeout` setting was not being correctly set on the SSHD
+backend, causing idle sessions to not time out.
+
+* Add the correct license for AsciiDoctor.
++
+AsciiDoctor is licensed under the MIT License, not Apache2 as previously
+documented.

ReleaseNotes/ReleaseNotes-2.12.4.txt

@@ -93,7 +93,7 @@ Fix 'Cannot format velocity template' error when sending notification emails.
 
 * Fix `sshd.idleTimeout` setting being ignored.
 +
-Ths `sshd.idleTimeout` setting was not being correctly set on the SSHD
+The `sshd.idleTimeout` setting was not being correctly set on the SSHD
 backend, causing idle sessions to not time out.
 
 * link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4324[Issue 4324]:

ReleaseNotes/index.txt

@@ -14,6 +14,7 @@
 
 [[s2_11]]
 == Version 2.11.x
+* link:ReleaseNotes-2.11.10.html[2.11.10]
 * link:ReleaseNotes-2.11.9.html[2.11.9]
 * link:ReleaseNotes-2.11.8.html[2.11.8]
 * link:ReleaseNotes-2.11.7.html[2.11.7]