diff options
| author | varac <varacanero@zeromail.org> | 2015-05-04 14:03:50 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-05-04 14:03:50 +0200 |
| commit | 943dd94dfab1de9316a5ed4c0751b36a6c75447a (patch) | |
| tree | ea8e120b7d7ef84ba71391f39870092e43391627 /1fbc9a3866390a65c3bfbd90ef2df53379cd0a8e | |
| parent | 750a497758d94c2f5a6cad23cecc3dbde2d2f92f (diff) | |
| parent | e9596d0f6d243ae00bb5b360a5c37bed577c5438 (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Conflicts:
templates/sshd_config/Debian_wheezy.erb
Diffstat (limited to '1fbc9a3866390a65c3bfbd90ef2df53379cd0a8e')
0 files changed, 0 insertions, 0 deletions