From: Mickael Remond <mremond@process-one.net>
Date: Tue, 7 May 2019 12:09:22 +0000 (+0200)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 19.05~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=945c58d3dbaba5fcaface2ff8e08964df80b0b76;p=ejabberd

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

945c58d3dbaba5fcaface2ff8e08964df80b0b76