diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-08 16:41:52 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-08 16:41:52 -0800 |
| commit | a08ac06083a40eb1455e5fa14cd644f7a2350f16 (patch) | |
| tree | 858e25839e0df86360c66ce93cbfe06e16c876b0 | |
| parent | 6393175f6526e89b904461e3ef185b4131ea4fdb (diff) | |
| parent | 6ecde066fcd0a23238e8b8929c4e1bef48618df1 (diff) | |
Merge branch '1.12'
| -rw-r--r-- | paramiko/__init__.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 32ccfcdb..c996302a 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.12.0" +__version__ = "1.12.1" __version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __license__ = "GNU Lesser General Public License (LGPL)" @@ -54,7 +54,7 @@ if sys.platform == 'darwin': setup(name = "paramiko", - version = "1.12.0", + version = "1.12.1", description = "SSH2 protocol library", author = "Jeff Forcier", author_email = "jeff@bitprophet.org", |