From 01735419f3094852b650d34368c1e1126c9767a4 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Mon, 7 May 2012 20:23:29 -0700
Subject: Bump to 1.7.14 (cherry picked from commit
 c3a7e9d587447afdc714b02412594b8d0a9fecfa)

Conflicts:
	setup.py
---
 CHANGES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CHANGES')

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.
-- 
cgit v1.2.3