From: Evgeny Khramtsov <ekhramtsov@process-one.net>
Date: Fri, 23 Nov 2018 13:25:02 +0000 (+0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 18.12~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94ef57721baade548ff85602d7f3cbe2eaff45d3;p=ejabberd

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

94ef57721baade548ff85602d7f3cbe2eaff45d3