summaryrefslogtreecommitdiff
path: root/paramiko/__init__.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2013-07-26 15:06:58 -0700
committerJeff Forcier <jeff@bitprophet.org>2013-07-26 15:06:58 -0700
commitd2c71ed9994baa167f7eaf26683f17a0be4b7c02 (patch)
tree3d15d02bb16999b6f773426f82e26ccd8695173d /paramiko/__init__.py
parentcaf94786ca8c0bc9e3995da0a160c84921a3bfc6 (diff)
parent965d00dee951ffaee7458c7f8cb0a3c38ff46b25 (diff)
downloadparamiko-d2c71ed9994baa167f7eaf26683f17a0be4b7c02.tar.gz
Merge branch '1.10'
Conflicts: NEWS setup.py
Diffstat (limited to 'paramiko/__init__.py')
-rw-r--r--paramiko/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index b305d9c4..d720e37e 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -57,7 +57,7 @@ if sys.version_info < (2, 5):
__author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.10.1"
+__version__ = "1.10.2"
__license__ = "GNU Lesser General Public License (LGPL)"