summaryrefslogtreecommitdiffhomepage
path: root/setup.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-02-14 09:39:38 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-02-14 09:39:38 -0800
commit3fcde4e7f419b57859d73bea86ce4c041912b2d3 (patch)
treefc0a7aa4398d8ba37adbe60620e2e794aaa337ab /setup.py
parent6aada73b0ecc90861af19fbc2b8e86eb05b1f274 (diff)
parentfb786bea9cff8fba3c6852d216dbbcbafbbb524f (diff)
Merge branch '1.12'
Conflicts: sites/www/changelog.rst
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index f50cfd23..7d6706ed 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ if sys.platform == 'darwin':
setup(name = "paramiko",
- version = "1.12.1",
+ version = "1.12.2",
description = "SSH2 protocol library",
author = "Jeff Forcier",
author_email = "jeff@bitprophet.org",