diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-12-06 16:38:40 -0800 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-12-06 16:38:40 -0800 |
commit | 3f6dee4764a295e70bdb06a4df43b4087542620d (patch) | |
tree | dc9acfb6bd1dc8b2f8f7cfdaf6b89de299a50cde /.merge-branch-exclude | |
parent | e61112ffb90517553b7804082ad19ffe78818f7c (diff) | |
parent | 1044b3dd982e4d327ca1c3044bf70d12403a7f58 (diff) | |
download | vyatta-cfg-3f6dee4764a295e70bdb06a4df43b4087542620d.tar.gz vyatta-cfg-3f6dee4764a295e70bdb06a4df43b4087542620d.zip |
Merge branch 'mendocino' of vm:rel/vyatta-cfg into mendocino
Diffstat (limited to '.merge-branch-exclude')
0 files changed, 0 insertions, 0 deletions