summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-02-14 09:32:08 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-02-14 09:32:08 -0800
commitddea189319a685999b372699b9f5b81cfab5a9cb (patch)
tree2ecde199a767258cfe9907155a37e6caf942dfc6
parent758543f2381809c54a9cea38228847ccfecceb9f (diff)
parent6d4b37a17f623c2f28c7e372402ab9c8750db95d (diff)
downloadparamiko-ddea189319a685999b372699b9f5b81cfab5a9cb.tar.gz
Merge branch '1.11' into 1.12
-rw-r--r--sites/www/changelog.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 1f0d55fe..0a53209d 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -11,7 +11,7 @@ Changelog
Thanks to Marius Gedminas for catch & patch.
* :bug:`34` (PR :issue:`35`) Fix SFTP prefetching incompatibility with some
SFTP servers regarding request/response ordering. Thanks to Richard
- Kettlewell for catch & patch.
+ Kettlewell.
* :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.