summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-01 16:05:23 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-01 16:05:23 -0700
commit0671794bb53957ba1ce25d0b6acb47f46ed738d5 (patch)
treed246857beaf91c4eeb02ce23604107d5ba65b01e /debian
parent1b61a441d6faf8061c496110ec1ca90ac6bfdf1c (diff)
parent00e011952b6271bef41e5c8c0e1bf67306e87d8c (diff)
downloadvyatta-cfg-0671794bb53957ba1ce25d0b6acb47f46ed738d5.tar.gz
vyatta-cfg-0671794bb53957ba1ce25d0b6acb47f46ed738d5.zip
Merge branch 'jenner' into kenwood
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 0 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index a139faa..e37bfe5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-vyatta-cfg (0.14.92) unstable; urgency=low
-
- * UNRELEASED
-
- -- An-Cheng Huang <ancheng@vyatta.com> Fri, 29 May 2009 18:35:41 -0700
-
vyatta-cfg (0.14.91) unstable; urgency=low
* Bugfix 4235: Code cleanup.