summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2008-06-09 19:01:28 -0700
committerStig Thormodsrud <stig@vyatta.com>2008-06-09 19:01:28 -0700
commitfc24acbd57df4f967e7cec5fd98c3292f06105d5 (patch)
tree642a4352f4cf69e9bdad41865aa0992deebbe046 /templates
parent0a45e74a8fadd4f434752bb70b0da936c68359f5 (diff)
parent1469f24f7b452f3412f83a5ac54a18b2caf63348 (diff)
downloadvyatta-op-fc24acbd57df4f967e7cec5fd98c3292f06105d5.tar.gz
vyatta-op-fc24acbd57df4f967e7cec5fd98c3292f06105d5.zip
Merge branch 'hollywood' of http://git.vyatta.com/vyatta-op into hollywood
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions