From: Mickael Remond <mremond@process-one.net>
Date: Mon, 25 Jan 2016 22:28:33 +0000 (+0100)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 16.02~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc2d5da1121d7d5abf650174600c3bad719cccd4;p=ejabberd

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

fc2d5da1121d7d5abf650174600c3bad719cccd4