diff options
| author | Rick Balocca <rbalocca@vyatta.com> | 2008-10-30 14:44:57 -0700 |
|---|---|---|
| committer | Rick Balocca <rbalocca@vyatta.com> | 2008-10-30 14:44:57 -0700 |
| commit | 760b722ba1cb9d1f69e0753e13e2002611c3033e (patch) | |
| tree | ef688d4d9144e5955c595bbafc8b9361792a74c1 /configure.ac | |
| parent | 841e41f385ca960fb703ff612b014d7e57560b3e (diff) | |
| parent | 81bd193daacbf4b1f3ee74fe940151ac90174870 (diff) | |
| download | vyatta-cfg-system-760b722ba1cb9d1f69e0753e13e2002611c3033e.tar.gz vyatta-cfg-system-760b722ba1cb9d1f69e0753e13e2002611c3033e.zip | |
Merge branch 'islavista' into jenner
Conflicts:
scripts/standalone_root_pw_reset
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions