diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:27:37 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:27:46 -0700 |
| commit | c538a000121d66e388bcb92c19cc018efcf4cce4 (patch) | |
| tree | 15056124661c5f5d3540741ac75d66f1ea4838df /setup.py | |
| parent | 148f3d2fd46ca58c641a23bc7dad313460f9eb5d (diff) | |
| parent | 4fdb4b5ae52b8e7cada05c5590a0cd0ab1b575d5 (diff) | |
Merge branch '1.10' into 1.11.
Also bump versions like a dummy.
Conflicts:
paramiko/__init__.py
setup.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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", |