diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2013-10-16 17:00:33 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2013-10-16 17:00:33 -0700 |
| commit | 3232ce84ed141af38f444ecdb24050603430a3c6 (patch) | |
| tree | c959a99e354b97d2fdb4de96beb79ab73f5db005 | |
| parent | f2466a3d46493127e3b547f8f5c6d76c247bb3b4 (diff) | |
| parent | 858d3fd07f8c22eeb859891325885ca72cc7acea (diff) | |
Merge branch '1.9' into 1.10
Conflicts:
paramiko/__init__.py
| -rw-r--r-- | paramiko/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 9f89b661..b2e1c03e 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -56,6 +56,7 @@ if sys.version_info < (2, 5): __author__ = "Jeff Forcier <jeff@bitprophet.org>" __version__ = "1.10.4" +__version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __license__ = "GNU Lesser General Public License (LGPL)" |