summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-08-05 10:39:08 -0700
committerRick Balocca <rbalocca@vyatta.com>2008-08-05 10:39:08 -0700
commitcf7ce7c5ba91398387ba2558d834181167185ff1 (patch)
tree404dfb120c2ff84a170be1e80c4c4b710327034a
parentfd861f498cf59905f4371531204b3edfb4777578 (diff)
parent8ebcdb5fffd941cb12aae2adab6338a6ca4938cd (diff)
downloadvyatta-nat-cf7ce7c5ba91398387ba2558d834181167185ff1.tar.gz
vyatta-nat-cf7ce7c5ba91398387ba2558d834181167185ff1.zip
Merge branch 'hollywood' into islavista
-rw-r--r--debian/changelog13
1 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bc49a04..f0dd8ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+vyatta-nat (0.11) unstable; urgency=low
+
+ 3.1.2
+ [ Mark O'Brien ]
+
+
+ [ An-Cheng Huang ]
+ * fix for bug 3289: add rule description
+
+ [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@firebolt.vyatta.com> Wed, 23 Jul 2008 21:36:05 -0700
+
vyatta-nat (0.10) unstable; urgency=low
3.1.0