Merge branch '1.10' into 1.11.

Also bump versions like a dummy. Conflicts: paramiko/__init__.py setup.py
beckjake · Mar 14, 2014 · c538a00 · c538a00
2 parents 148f3d2 + 4fdb4b5
commit c538a00
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
@@ -23,7 +23,7 @@
 
 
 __author__ = "Jeff Forcier <[email protected]>"
-__version__ = "1.11.4"
+__version__ = "1.11.5"
 __version_info__ = tuple([ int(d) for d in __version__.split(".") ])
 __license__ = "GNU Lesser General Public License (LGPL)"
 

diff --git a/setup.py b/setup.py
@@ -52,7 +52,7 @@
 
 
 setup(name = "paramiko",
-      version = "1.11.4",
+      version = "1.11.5",
       description = "SSH2 protocol library",
       author = "Jeff Forcier",
       author_email = "[email protected]",

diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
 Changelog
 =========
 
+* :release:`1.10.7 <2014-03-13>`
 * :support:`256 backported` Convert API documentation to Sphinx, yielding a new
   API docs website to replace the old Epydoc one. Thanks to Olle Lundberg for
   the initial conversion work.