Release 1.7.12

(cherry picked from commit c630917d0d0ff2ac4e1185f4077074cd3748d05b)

Conflicts:
	paramiko/__init__.py
	setup.py

3 files changed, 3 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index 1c1bf4bd..df8f1d31 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 Temporary, post-Paramiko changelog while we get our sh!t together.
 
-## ssh 1.7.12 (2012-MM-DD)
+## ssh 1.7.12 (2012-02-10)
 
 * Added an IO loop sleep() call to avoid needless CPU usage when agent
   forwarding is in use.
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 653825e5..734030c4 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -60,7 +60,7 @@ if sys.version_info < (2, 2):
 
 
 __author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.7.11"
+__version__ = "1.7.12"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/setup.py b/setup.py
index 415bc0a0..97770ce5 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ if sys.platform == 'darwin':
 
 
 setup(name = "paramiko",
-      version = "dev",
+      version = "1.7.12",
       description = "SSH2 protocol library",
       author = "Jeff Forcier",
       author_email = "jeff@bitprophet.org",