Merge branch '1.10' into 1.11

Updated versions for 1.11.2.

Conflicts:
	paramiko/__init__.py
	setup.py

2 files changed, 2 insertions, 2 deletions

diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index b9853722..b3f86c91 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -57,7 +57,7 @@ if sys.version_info < (2, 5):
 
 
 __author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.11.1"
+__version__ = "1.11.2"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/setup.py b/setup.py
index 9e194985..529ed89d 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ if sys.platform == 'darwin':
 
 
 setup(name = "paramiko",
-      version = "1.11.1",
+      version = "1.11.2",
       description = "SSH2 protocol library",
       author = "Jeff Forcier",
       author_email = "jeff@bitprophet.org",