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 | 727fa16487600bc36d7f394fdeadb9dc78214d27 (patch) | |
| tree | 679d1845223dfcf6e301b2f23d7edfd320140d61 | |
| parent | 69a86cbb04a11c41365b6001c8818663cbea05d8 (diff) | |
| parent | 6315c678a346c411d6ee14536f9d05563b1945eb (diff) | |
| download | vyatta-cfg-quagga-727fa16487600bc36d7f394fdeadb9dc78214d27.tar.gz vyatta-cfg-quagga-727fa16487600bc36d7f394fdeadb9dc78214d27.zip | |
Merge branch 'glendale' of git:/git/vyatta-cfg-quagga 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 791ca8cf..d849f6ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,7 +48,7 @@ vyatta-cfg-quagga (0.3) unstable; urgency=low [ Mark O'Brien ] - -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 16:59:19 -0700 + -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:03:48 -0700 vyatta-cfg-quagga (0.2) unstable; urgency=low |