diff options
| author | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:50 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:50 -0700 |
| commit | 314a40af87a37cac33cb78835f0c18690d697419 (patch) | |
| tree | 3a5e7fdd37fbf9fcec84132230d9e03dd3f6c3cd | |
| parent | 2c4e3a7afa36b3cb4451fc21289a4b62a5f2c4c2 (diff) | |
| parent | 925876eafbd600fc8479403da1567c360d06293d (diff) | |
| download | vyatta-op-qos-314a40af87a37cac33cb78835f0c18690d697419.tar.gz vyatta-op-qos-314a40af87a37cac33cb78835f0c18690d697419.zip | |
Merge branch 'glendale' of git:/git/vyatta-op-qos into glendale
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 76ce304..8d21cc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ vyatta-op-qos (0.3) unstable; urgency=low [ Mark O'Brien ] - -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 17:00:17 -0700 + -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:04:45 -0700 vyatta-op-qos (0.2) unstable; urgency=low |