summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-09-27 22:00:32 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-09-27 22:00:32 -0700
commit96fdefbcb99b5513e3c7c78518cfd1ad5ba8137f (patch)
tree0a10273b0b4938df1307162936a6f8cc5e9d1cd1 /setup.py
parentceb39683dc3a5326b090edec855366e4dfe70887 (diff)
parentf2466a3d46493127e3b547f8f5c6d76c247bb3b4 (diff)
downloadparamiko-96fdefbcb99b5513e3c7c78518cfd1ad5ba8137f.tar.gz
Merge branch '1.10' into 1.11v1.11.21.11.2
Updated versions for 1.11.2. Conflicts: paramiko/__init__.py setup.py
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
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",