summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-01-30 10:55:10 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-01-30 10:57:06 -0800
commit343d0492a74e80e915f62c394c76f5b34415025b (patch)
tree531ce03f09b70ba5548c2e142d41674a06396086 /sites/www
parenta83f0d3038e8d16e7c160293d16c2736645564d6 (diff)
Backport changelog bugfix from 1.12
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index ec27dfca..6e5f6188 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,8 +2,8 @@
Changelog
=========
-* :release:`1.11.4 <2014-01-21>`
-* :release:`1.10.6 <2014-01-21>`
+* :release:`1.11.4 <2014-01-21>` 193
+* :release:`1.10.6 <2014-01-21>` 193
* :bug:`193` (and its attentant PRs :issue:`230` & :issue:`253`): Fix SSH agent
problems present on Windows. Thanks to David Hobbs for initial report and to
Aarni Koskela & Olle Lundberg for the patches.
@@ -13,7 +13,7 @@ Changelog
to Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test
case.
* :release:`1.11.2 <2013-09-27>`
-* :release:`1.10.4 <2013-09-27>` 179, 200, 199
+* :release:`1.10.4 <2013-09-27>` 199, 200, 179
* :bug:`156` Fix potential deadlock condition when using Channel objects as
sockets (e.g. when using SSH gatewaying). Thanks to Steven Noonan and Frank
Arnold for catch & patch.