Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2015-12-02 21:39:20 +01:00
11 changed files with 70 additions and 31 deletions

View File

@@ -7,6 +7,7 @@ etc/ipsec.user.conf
etc/ipsec.user.secrets
etc/localtime
etc/shadow
etc/snort/snort.conf
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf