summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-13 21:27:37 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-13 21:27:46 -0700
commitc538a000121d66e388bcb92c19cc018efcf4cce4 (patch)
tree15056124661c5f5d3540741ac75d66f1ea4838df /setup.py
parent148f3d2fd46ca58c641a23bc7dad313460f9eb5d (diff)
parent4fdb4b5ae52b8e7cada05c5590a0cd0ab1b575d5 (diff)
downloadparamiko-c538a000121d66e388bcb92c19cc018efcf4cce4.tar.gz
Merge branch '1.10' into 1.11.v1.11.51.11.5
Also bump versions like a dummy. 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 e6ae2dda..3c2c7af3 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ if sys.platform == 'darwin':
setup(name = "paramiko",
- version = "1.11.4",
+ version = "1.11.5",
description = "SSH2 protocol library",
author = "Jeff Forcier",
author_email = "jeff@bitprophet.org",