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:56:03 -0800
commit70bcde95c1df9858c9e7dbe5310c8bfc0b4b5d5b (patch)
tree6deae2705a6e0e04a38dcc1d96da260d740dbdfa /sites/www
parent176493823c4a580bbfd602a19e3fee5d84c5e080 (diff)
Backport changelog bugfix from 1.12
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index eaf380da..05392858 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,7 +2,7 @@
Changelog
=========
-* :release:`1.10.6 <2014-01-21>`
+* :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.
@@ -10,7 +10,7 @@ Changelog
* :bug:`176` Fix AttributeError bugs in known_hosts file (re)loading. Thanks
to Nathan Scowcroft for the patch & Martin Blumenstingl for the initial test
case.
-* :release:`1.10.4 <2013-09-27>`
+* :release:`1.10.4 <2013-09-27>` 199, 200, 179
* :bug:`179` Fix a missing variable causing errors when an ssh_config file has
a non-default AddressFamily set. Thanks to Ed Marshall & Tomaz Muraus for
catch & patch.