diff options
| author | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:41:15 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:41:15 -0700 |
| commit | 01fb41d98c74c1685f8a90e78198677bc0cb0a28 (patch) | |
| tree | 4c7c962971b9da30b18c3b05f30c2ded86b1da12 | |
| parent | c91cc2ec4adf388e0df43dcc7731b315ca15eba7 (diff) | |
| parent | 6e436fd25e09adece8931754b85df415ba3a9007 (diff) | |
| download | vyatta-cfg-system-01fb41d98c74c1685f8a90e78198677bc0cb0a28.tar.gz vyatta-cfg-system-01fb41d98c74c1685f8a90e78198677bc0cb0a28.zip | |
Merge branch 'glendale' of git:/git/vyatta-cfg-system into glendale
Conflicts:
debian/changelog
sysconf/version
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 90766183..1768fc2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,7 +53,7 @@ vyatta-cfg-system (0.3) unstable; urgency=low [ Mark O'Brien ] - -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 16:59:30 -0700 + -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:03:58 -0700 vyatta-cfg-system (0.2) unstable; urgency=low |