summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-01 16:06:33 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-01 16:06:33 -0700
commite9bec39ea6198e36745255a1853fe03f9a65a727 (patch)
treea2730e4e6ecf9a17a5cc654529714bc1e7b1320c /README
parent15d9e99bae90169cce6da359cb45d5cda7076b71 (diff)
parent19a38fe4d18f05d69b97c6785d5ef752479db7bb (diff)
downloadvyatta-cfg-quagga-e9bec39ea6198e36745255a1853fe03f9a65a727.tar.gz
vyatta-cfg-quagga-e9bec39ea6198e36745255a1853fe03f9a65a727.zip
Merge branch 'jenner' into kenwood
Conflicts: debian/changelog
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions