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 /.gitignore | |
| 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
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions