summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Bays <robert@vyatta.com>2010-11-18 17:51:01 -0800
committerRobert Bays <robert@vyatta.com>2010-11-18 17:51:01 -0800
commit29adb769e631e9d0b929610284a932c61bc3194e (patch)
tree732440b9ff671854cd7749d6c1687f6de7306818
parentc16eed83ace66660a643273b052ebaa537afd373 (diff)
parentd77256d8a3b8f45c13891044fb52fd347c221110 (diff)
downloadvyatta-cfg-quagga-29adb769e631e9d0b929610284a932c61bc3194e.tar.gz
vyatta-cfg-quagga-29adb769e631e9d0b929610284a932c61bc3194e.zip
Merge branch 'mendocino' of http://git.vyatta.com/vyatta-cfg-quagga into mendocino
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 30d6a6ed..56b18fc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg-quagga (0.18.114) unstable; urgency=low
+
+ * fix for 6069
+
+ -- Michael Larson <mike@vyatta.com> Thu, 18 Nov 2010 16:48:11 -0800
+
vyatta-cfg-quagga (0.18.113) unstable; urgency=low
* Revert "Looks like merge with larkspur missed this..."