Merge remote-tracking branch 'upstream/master' into mgmt-auth

Conflicts:
	management/daemon.py
This commit is contained in:
Michael Kropat
2014-06-21 21:29:25 -04:00
9 changed files with 97 additions and 35 deletions
+1
View File
@@ -123,6 +123,7 @@ EOF
# Start service configuration.
. setup/system.sh
. setup/ssl.sh
. setup/dns.sh
. setup/mail.sh
. setup/dkim.sh