summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorrbalocca <rbalocca@vyatta.com>2008-04-04 10:27:45 -0700
committerrbalocca <rbalocca@vyatta.com>2008-04-04 10:27:45 -0700
commit18b7f9a1d068b7f1261f692db30ea54955691abe (patch)
tree8691c1f7f54e6687f24c93eeb1039599f8e2f64b /templates
parentf71417e0209a48bb88fb614acb186109e0573941 (diff)
parent41b4c40773d3fdc7dc9a204973038b1992107031 (diff)
downloadvyatta-cfg-18b7f9a1d068b7f1261f692db30ea54955691abe.tar.gz
vyatta-cfg-18b7f9a1d068b7f1261f692db30ea54955691abe.zip
Merge branch 'glendale' into hollywood
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions