Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

 server/mods-available/xmpp_module.inc.php

@@ -112,7 +112,6 @@

        // load the server configuration options
        $app->uses('getconf,system');
        $xmpp_config = $app->getconf->get_server_config($conf['server_id'], 'xmpp');

        $daemon = 'metronome';