diff options
| author | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:51 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:51 -0700 |
| commit | 5d1722915113f8bd1ec1437efc0845cd1b063625 (patch) | |
| tree | e2a9b216481335b5db44d0d06943ac33a7348261 | |
| parent | 411c0b67fb1cd386c49541bcc02d865763388c01 (diff) | |
| parent | 37ab534f952f6cb2dd72587a41dfac785c7539ba (diff) | |
| download | vyatta-op-vpn-5d1722915113f8bd1ec1437efc0845cd1b063625.tar.gz vyatta-op-vpn-5d1722915113f8bd1ec1437efc0845cd1b063625.zip | |
Merge branch 'glendale' of git:/git/vyatta-op-vpn 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 2398dae..7f51053 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,7 @@ vyatta-op-vpn (0.3) unstable; urgency=low [ Mark O'Brien ] - -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 17:00:25 -0700 + -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:04:52 -0700 vyatta-op-vpn (0.2) unstable; urgency=low |