From 53f9b4f72acbae5b55873dcc9cf3647173ff32f5 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Thu, 20 Jan 2011 19:41:18 -0600
Subject: 0.12.47

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index 3ab3125..6a5dd85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vyatta-cfg-vpn (0.12.47) unstable; urgency=low
+
+  * fix conflict while merging
+  * make adjustment so that op mode can deal with new secrets file
+    format
+
+ -- John Southworth <john.southworth@vyatta.com>  Thu, 20 Jan 2011 19:41:18 -0600
+
 vyatta-cfg-vpn (0.12.46) unstable; urgency=low
 
   * error location support changes to vpn (local-ip and auth missing
-- 
cgit v1.2.3