Merge branch '1.11' into 1.12
Conflicts: paramiko/__init__.py
This commit is contained in:
commit
a9a5f69c1a
|
@ -58,6 +58,7 @@ if sys.version_info < (2, 5):
|
|||
|
||||
__author__ = "Jeff Forcier <jeff@bitprophet.org>"
|
||||
__version__ = "1.12.0"
|
||||
__version_info__ = tuple([ int(d) for d in __version__.split(".") ])
|
||||
__license__ = "GNU Lesser General Public License (LGPL)"
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue