summaryrefslogtreecommitdiff
path: root/scripts/dns-forwarding
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-08-11 15:46:19 -0700
committerRick Balocca <rbalocca@vyatta.com>2008-08-11 15:46:19 -0700
commit3c1c49056fbb970a943464317beb883700a7401f (patch)
tree7bdd2120dddd01c49f3dc53ad28c1394d3f60db7 /scripts/dns-forwarding
parent0f78fcfe3c21e4d07b402aaae75bb494fc4e4133 (diff)
parent883737f620c6e0e95b1f92d2e24e9375efb20910 (diff)
downloadvyatta-cfg-quagga-3c1c49056fbb970a943464317beb883700a7401f.tar.gz
vyatta-cfg-quagga-3c1c49056fbb970a943464317beb883700a7401f.zip
Merge branch 'hollywood' into islavista
Conflicts: scripts/grub-setup
Diffstat (limited to 'scripts/dns-forwarding')
0 files changed, 0 insertions, 0 deletions