Merge branch 'master' into redesign

This commit is contained in:
Michael Kaufmann (d00p)
2011-02-09 10:54:31 +01:00
3 changed files with 1515 additions and 1360 deletions

View File

@@ -10,7 +10,7 @@ syslog_facility = local1
#auth_debug_passwords= yes
#auth_verbose= yes
#
#ssl=yes
ssl=no
#ssl_ca_file = /etc/ssl/<SERVERNAME>.crt
#ssl_cert_file = /etc/ssl/<SERVERNAME>.crt
#ssl_key_file = /etc/ssl/<SERVERNAME>.key