summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark O'Brien <mobrien@vyatta.com>2008-03-19 18:38:46 -0700
committerMark O'Brien <mobrien@vyatta.com>2008-03-19 18:38:46 -0700
commitd172ec7b00c7da2a54377b7f6f115a528ecf11d6 (patch)
tree26335baac7f3dae47192329e790e3efea9c803be
parent17efed6c5fef8d596f3a1c5a9032e1f762fcab65 (diff)
parent19fd1d7d0d254b2b1ad1d594e475c73bfcbfa759 (diff)
downloadvyatta-cfg-qos-d172ec7b00c7da2a54377b7f6f115a528ecf11d6.tar.gz
vyatta-cfg-qos-d172ec7b00c7da2a54377b7f6f115a528ecf11d6.zip
Merge branch 'glendale' of git:/git/vyatta-cfg-qos into glendale
Conflicts: debian/changelog
-rw-r--r--debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ccaec8a..529f71e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,7 +38,7 @@ vyatta-cfg-qos (0.3) unstable; urgency=low
[ Mark O'Brien ]
- -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 16:59:11 -0700
+ -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:03:39 -0700
vyatta-cfg-qos (0.2) unstable; urgency=low