From: Mickael Remond <mremond@process-one.net>
Date: Thu, 1 Dec 2016 14:05:09 +0000 (+0100)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 16.12~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=309fd56fb4bbb82215e4e9873eeb677e49f804de;p=ejabberd

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

309fd56fb4bbb82215e4e9873eeb677e49f804de