diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-10 10:21:18 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-10 10:21:18 -0700 |
commit | b2fd1d96604d32bbe946f4df3118eb50454e6d26 (patch) | |
tree | 4de88daa9a4baefc864590971b18902e55ec0472 /etc | |
parent | cecf4322ff05df1acfa1cf22cba593e13e797197 (diff) | |
parent | 96c622d04550ae38bd2d1ebc8d209a79e4017067 (diff) | |
download | vyatta-op-b2fd1d96604d32bbe946f4df3118eb50454e6d26.tar.gz vyatta-op-b2fd1d96604d32bbe946f4df3118eb50454e6d26.zip |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-op into jenner
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions