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 | e20a40ffb58f76c93665272aa51d55f354ce0d6c (patch) | |
| tree | 771c53cbfd46e3665ba05d3e77d4108d320e815e | |
| parent | 77134a3171af8a9db2283c7a1b7fdc9cf2a5714b (diff) | |
| parent | d90d5055c00c4074456f48b7f9b7270d9589269d (diff) | |
| download | vyatta-cfg-vpn-e20a40ffb58f76c93665272aa51d55f354ce0d6c.tar.gz vyatta-cfg-vpn-e20a40ffb58f76c93665272aa51d55f354ce0d6c.zip | |
Merge branch 'glendale' of git:/git/vyatta-cfg-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 f1796f4..0fe20bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ vyatta-cfg-vpn (0.3) unstable; urgency=low [ Mark O'Brien ] - -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 16:59:32 -0700 + -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:04:00 -0700 vyatta-cfg-vpn (0.2) unstable; urgency=low |