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