diff options
| author | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:45 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@vyatta.com> | 2008-03-19 18:38:45 -0700 |
| commit | c0257dd3a75b0d0b0f938dfaf9234953853c47dd (patch) | |
| tree | 77e41ca542fbad710f5e18895bc905ceff32f5f9 | |
| parent | 518a70d38e62f7bb579d42a05e6406d89f8a42af (diff) | |
| parent | 9cf4ff5bc7622c148f6486d4c10e50fc0bfbe532 (diff) | |
| download | vyatta-cfg-firewall-c0257dd3a75b0d0b0f938dfaf9234953853c47dd.tar.gz vyatta-cfg-firewall-c0257dd3a75b0d0b0f938dfaf9234953853c47dd.zip | |
Merge branch 'glendale' of git:/git/vyatta-cfg-firewall 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 edf7f3f..a4add3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,7 @@ vyatta-cfg-firewall (0.3) unstable; urgency=low [ Mark O'Brien ] - -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 16:58:58 -0700 + -- Mark O'Brien <mobrien@vyatta.com> Tue, 18 Mar 2008 19:03:26 -0700 vyatta-cfg-firewall (0.2) unstable; urgency=low |