From 6a0139b85ca31ea88520c8896e97eb5228cc25df Mon Sep 17 00:00:00 2001
From: Gaurav Sinha <gaurav.sinha@vyatta.com>
Date: Fri, 20 Jan 2012 15:47:39 -0800
Subject: updating changelog for merge of expect-sync and oxnard

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

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 6b1f481..05ad082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+conntrack (0.9.14-2+vyatta14) unstable; urgency=low
+
+  * Collapse of expect-sync branch to oxnard. Brings in support for expect table sync. 
+
+ -- Gaurav Sinha <gaurav.sinha@vyatta.com>  Thu, 07 Jul 2011 20:52:06 -0700
+
 conntrack (0.9.14-2+vyatta13) unstable; urgency=low
 
   * new branch
-- 
cgit v1.2.3