From: Mickael Remond <mremond@process-one.net>
Date: Mon, 19 Nov 2018 09:40:05 +0000 (+0100)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 18.12~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=912d4e21659875d53614d51edea473a13109de5b;p=ejabberd

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

912d4e21659875d53614d51edea473a13109de5b