diff options
| author | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:47 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:47 -0700 |
| commit | fc22d48e028cd1fcddaf6d8af53fd94ca625e63c (patch) | |
| tree | 71b1155882d329d2e745c37312d329fd83c2c0ac | |
| parent | 520fc1ba6d76963d3483d74f7699108fc684a804 (diff) | |
| parent | dd649c9b86b3e58376a8b0b3c337cacf8eef9918 (diff) | |
| download | vyatta-cfg-fc22d48e028cd1fcddaf6d8af53fd94ca625e63c.tar.gz vyatta-cfg-fc22d48e028cd1fcddaf6d8af53fd94ca625e63c.zip | |
Merge branch 'glendale' of git:/git/vyatta-cfg 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 b351910..38a5169 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,7 +49,7 @@ vyatta-cfg (0.3) unstable; urgency=low [ Mark O'Brien ] - -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 16:59:41 -0700 + -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:04:10 -0700 vyatta-cfg (0.2) unstable; urgency=low |