From: Mickael Remond <mremond@process-one.net>
Date: Tue, 15 Mar 2016 21:42:15 +0000 (+0100)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 16.03~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c2cd91fb1386c094a4b0deb92bc28225d80454e;p=ejabberd

Merge branch 'master' of github.com:processone/ejabberd
---

3c2cd91fb1386c094a4b0deb92bc28225d80454e