Merge branch '1.9' into 1.10

Conflicts: paramiko/__init__.py
2013-10-16 17:00:33 -07:00 · 2013-10-16 17:00:33 -07:00 · 3232ce84ed
parent f2466a3d46 858d3fd07f
commit 3232ce84ed
1 changed files with 1 additions and 0 deletions
--- 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)"