summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeepti Kulkarni <deepti@vyatta.com>2011-12-16 04:22:07 -0800
committerDeepti Kulkarni <deepti@vyatta.com>2011-12-16 04:22:07 -0800
commit6da6800747428943adf04d87cff71c1f026280b9 (patch)
tree6fb0bd77aa66a21e2682245ae4adb1562117fb3d
parentbad26964038fbe9d8b904e500c9fc3f90a70a005 (diff)
downloadvyatta-conntrack-debian/0.22.tar.gz
vyatta-conntrack-debian/0.22.zip
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d0f653e..d9c2805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-conntrack (0.22) unstable; urgency=low
+
+ * Resolved merge errors from Makefile.
+
+ -- Deepti Kulkarni <deepti@vyatta.com> Fri, 16 Dec 2011 04:22:07 -0800
+
vyatta-conntrack (0.21) unstable; urgency=low
* Fixing broken build as a result of merge