From: Christophe Romain <christophe.romain@process-one.net>
Date: Wed, 27 Sep 2017 09:12:09 +0000 (+0200)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 17.09~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1d3d1318e40bd9a22525e2ae44f17aedc728269;p=ejabberd

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

c1d3d1318e40bd9a22525e2ae44f17aedc728269