Fix a mistake during last merge
Merge branch 'master' into xmpp_server_administration
Merge branch 'xmpp_server_administration' of https://github.com/CyrilPeponnet/Archipel into xmpp_server_administration