Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-19 dc7aa0813f52eed4eb039a21ee13d6a5cb7f104c

 install/lib/installer_base.lib.php

@@ -1630,7 +1630,7 @@
        caselog('chmod u+x /etc/init.d/metronome', __FILE__, __LINE__);
        caselog('update-rc.d metronome defaults', __FILE__, __LINE__);

        exec($this->getinitcommand('metronome', 'restart'));
        exec($this->getinitcommand($conf['xmpp']['init_script'], 'restart'));

/*
writing new private key to 'smtpd.key'