From: Christophe Romain <christophe.romain@process-one.net>
Date: Tue, 30 May 2017 10:37:27 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/joudinet/ejabberd into joudinet-master
X-Git-Tag: 17.06-beta~27^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0042f18c1f8014d0a55e18ae12680698b89d7b8c;p=ejabberd

Merge branch 'master' of https://github.com/joudinet/ejabberd into joudinet-master
---

0042f18c1f8014d0a55e18ae12680698b89d7b8c