From: Christophe Romain <christophe.romain@process-one.net>
Date: Wed, 2 Aug 2017 10:25:50 +0000 (+0200)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 17.08~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1df61a82c869186d2c14a867409da3e0cc2d23fe;p=ejabberd

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

1df61a82c869186d2c14a867409da3e0cc2d23fe