From: Christophe Romain <christophe.romain@process-one.net>
Date: Tue, 24 Apr 2018 12:44:58 +0000 (+0200)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 18.04~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67773c517427d3751e672ea1f52b4d74e728369e;p=ejabberd

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

67773c517427d3751e672ea1f52b4d74e728369e