Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-22 17d53616b36fef3b753fc408bfc600f360673333

 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'