From: Evgeny Khramtsov <ekhramtsov@process-one.net>
Date: Sun, 19 May 2019 08:23:29 +0000 (+0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 19.05~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17f9ffb7e73e614630cf35c4eeaf9c2d1cf055f9;p=ejabberd

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

17f9ffb7e73e614630cf35c4eeaf9c2d1cf055f9