diff options
| author | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:49 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:49 -0700 |
| commit | 93d683ea6b2820e4c035832db4f484a9bd13747a (patch) | |
| tree | 2eb9469866df65711f8c903c5e28fc8d841084f5 | |
| parent | 17ad7deeeba3e36f25f0c13d30abbf32e39f8e82 (diff) | |
| parent | 7fc2e15229601b44803798955d14a431ee44c56e (diff) | |
| download | vyatta-nat-93d683ea6b2820e4c035832db4f484a9bd13747a.tar.gz vyatta-nat-93d683ea6b2820e4c035832db4f484a9bd13747a.zip | |
Merge branch 'glendale' of git:/git/vyatta-nat 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 cd6af76..f61a717 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ vyatta-nat (0.3) unstable; urgency=low [ Mark O'Brien ] - -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 17:00:09 -0700 + -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:04:37 -0700 vyatta-nat (0.2) unstable; urgency=low |