summaryrefslogtreecommitdiff
path: root/.merge-branch-exclude
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-10-31 16:01:27 -0700
committerStig Thormodsrud <stig@vyatta.com>2009-10-31 16:01:27 -0700
commit37dbea348afb8d0770767441c30e5ab1e2cea874 (patch)
tree0cc6f5bf213ef68f9a0537897e3f722365eb6bcf /.merge-branch-exclude
parentb817fa2eb752bc1f4a8d3c97b7749d003c2bb7d4 (diff)
parentc31a9da343fde640dfe652cafa7ac4cbdf7f61f2 (diff)
downloadvyatta-cfg-system-37dbea348afb8d0770767441c30e5ab1e2cea874.tar.gz
vyatta-cfg-system-37dbea348afb8d0770767441c30e5ab1e2cea874.zip
Merge branch 'kenwood' of http://git.vyatta.com/vyatta-cfg-system into kenwood
Diffstat (limited to '.merge-branch-exclude')
0 files changed, 0 insertions, 0 deletions