From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Wed, 15 Feb 2017 21:23:00 +0000 (+0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 17.03-beta~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26a581174485ca90782e59086cea0c3cc09133ea;p=ejabberd

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

26a581174485ca90782e59086cea0c3cc09133ea