From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Sat, 10 Feb 2018 08:36:48 +0000 (+0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 18.03~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97f913b8d93870448d03586df20b108147c1b8a7;p=ejabberd

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

97f913b8d93870448d03586df20b108147c1b8a7