From: Mickael Remond <mremond@process-one.net>
Date: Wed, 9 Nov 2016 08:04:58 +0000 (+0100)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 16.12~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42bede77a1a36c6bbc1ce3c2728e8c3dd78eb5f2;p=ejabberd

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

42bede77a1a36c6bbc1ce3c2728e8c3dd78eb5f2