summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorrbalocca <rbalocca@vyatta.com>2008-05-07 12:20:15 -0700
committerrbalocca <rbalocca@vyatta.com>2008-05-07 12:20:15 -0700
commitc0cb5fc6d753c6456c54ce0cf1dfb37fcd2d3a3b (patch)
tree28eeee0666b3ebe9ff539a1a265170b631ed5505 /ChangeLog
parent5564178c5cbaeb3364bf696a17992f42fd562424 (diff)
parent96e7d01c8ee7cd77bfa4f42b521189bc45799dcd (diff)
downloadvyatta-cfg-vpn-c0cb5fc6d753c6456c54ce0cf1dfb37fcd2d3a3b.tar.gz
vyatta-cfg-vpn-c0cb5fc6d753c6456c54ce0cf1dfb37fcd2d3a3b.zip
Merge branch 'glendale' into hollywood
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions