summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-10-16 17:00:13 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-10-16 17:00:13 -0700
commit858d3fd07f8c22eeb859891325885ca72cc7acea (patch)
treeac4fda14edf81fd5d3e7dd38a23cffbb7152a2d3
parent2de9c7272095f7b81c23d903d557e5a708a505d5 (diff)
parent6b222528f3b5a581e699c3364a5e327764689d40 (diff)
downloadparamiko-858d3fd07f8c22eeb859891325885ca72cc7acea.tar.gz
Merge branch '1.8' into 1.9
Conflicts: paramiko/__init__.py
-rw-r--r--paramiko/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 3cc5fb0b..3fd28ae4 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.9.0"
+__version_info__ = tuple([ int(d) for d in __version__.split(".") ])
__license__ = "GNU Lesser General Public License (LGPL)"