From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Mon, 5 Feb 2018 12:13:23 +0000 (+0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 18.03~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3327da72a6916824a1d27442b14ae04b32705d79;p=ejabberd

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

3327da72a6916824a1d27442b14ae04b32705d79