diff options
author | Rick Balocca <rbalocca@vyatta.com> | 2008-10-16 16:40:23 -0700 |
---|---|---|
committer | Rick Balocca <rbalocca@vyatta.com> | 2008-10-16 16:40:23 -0700 |
commit | 817dc77ad42cd9c7e6ebb394a094af8a6d287559 (patch) | |
tree | 54faa756bf5edb374c33e1836eacf0a967589d08 /templates/service/ssh/allow-root/node.def | |
parent | 8e26ab1c3bbb807b0e68829453c95bdf3795a4a6 (diff) | |
parent | ec928267b1e61e7a957515ad553bd171baf2d651 (diff) | |
download | vyatta-cfg-quagga-817dc77ad42cd9c7e6ebb394a094af8a6d287559.tar.gz vyatta-cfg-quagga-817dc77ad42cd9c7e6ebb394a094af8a6d287559.zip |
Merge branch 'hollywood' into islavista
Conflicts:
debian/vyatta-cfg-system.postinst.in
Diffstat (limited to 'templates/service/ssh/allow-root/node.def')
0 files changed, 0 insertions, 0 deletions