diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2013-10-16 17:00:46 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2013-10-16 17:00:46 -0700 |
| commit | 75c4304fe210962874d3b77584d70fe210c0a6f2 (patch) | |
| tree | 92249f634ef37f3f4c2c253f602d4fbd7935dcdd | |
| parent | 96fdefbcb99b5513e3c7c78518cfd1ad5ba8137f (diff) | |
| parent | 3232ce84ed141af38f444ecdb24050603430a3c6 (diff) | |
Merge branch '1.10' into 1.11
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 b3f86c91..be64dde0 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -58,6 +58,7 @@ if sys.version_info < (2, 5): __author__ = "Jeff Forcier <jeff@bitprophet.org>" __version__ = "1.11.2" +__version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __license__ = "GNU Lesser General Public License (LGPL)" |