Merge branch '1.13' into 1.14

Conflicts:
	paramiko/__init__.py
	setup.py
	sites/www/changelog.rst

1 files changed, 8 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 38e444f5..235fd0e3 100644
--- a/setup.py
+++ b/setup.py
@@ -54,9 +54,16 @@ if sys.platform == 'darwin':
     setup_helper.install_custom_make_tarball()
 
 
+# Version info -- read without importing
+_locals = {}
+with open('paramiko/_version.py') as fp:
+    exec(fp.read(), None, _locals)
+version = _locals['__version__']
+
+
 setup(
     name = "paramiko",
-    version = "1.14.1",
+    version = version,
     description = "SSH2 protocol library",
     long_description = longdesc,
     author = "Jeff Forcier",