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