From: Pablo Polvorin <ppolvorin@process-one.net>
Date: Tue, 19 Jul 2016 23:19:17 +0000 (-0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 16.08~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5a90be3cbdf4810d63d38e6e37a16cf79f442bf;p=ejabberd

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

b5a90be3cbdf4810d63d38e6e37a16cf79f442bf