Merge branch '1.10' into 1.11

Conflicts:
	paramiko/__init__.py
This commit is contained in:
Jeff Forcier 2013-10-16 17:00:46 -07:00
commit 75c4304fe2
1 changed files with 1 additions and 0 deletions

View File

@ -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)"