diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 14:32:22 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 14:32:22 -0800 |
| commit | 792cfe0cf65b1ad45cea36e76c3be3d7535c47d7 (patch) | |
| tree | eb83fa2092ae25e30368f0d01a0b3658b67c977a | |
| parent | 5aa0d401f61a56f8760ae6d4d64c3193e6d29def (diff) | |
| parent | 0a90bef4f47b4b29e119d78d7293184856bad605 (diff) | |
| download | paramiko-792cfe0cf65b1ad45cea36e76c3be3d7535c47d7.tar.gz | |
Merge branch '1.11' into 1.12
Conflicts:
sites/www/changelog.rst
| -rw-r--r-- | sites/www/changelog.rst | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 9df85c4b..1b4684ac 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,9 +2,6 @@ Changelog ========= -* :release:`1.12.2 <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. |