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

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

221d8e0e5d2ccb112e7ade757763c0f1cd8926ec