Bump to 1.7.14

(cherry picked from commit c3a7e9d587447afdc714b02412594b8d0a9fecfa)

Conflicts:
	setup.py

3 files changed, 3 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index e529a666..f584e342 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 Temporary, post-Paramiko changelog while we get our sh!t together.
 
-## ssh 1.7.14 (2012-MM-DD)
+## ssh 1.7.14 (2012-05-07)
 
 * #15: Implemented parameter substitution in SSHConfig, matching the
   implementation of `ssh_config(5)`. Thanks to Olle Lundberg for the patch.
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 2cf2abe1..9f2a8af5 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.13"
+__version__ = "1.7.14"
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/setup.py b/setup.py
index efc061d5..08684cad 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ if sys.platform == 'darwin':
 
 
 setup(name = "paramiko",
-      version = "1.7.13",
+      version = "1.7.14",
       description = "SSH2 protocol library",
       author = "Jeff Forcier",
       author_email = "jeff@bitprophet.org",