From: Evgeny Khramtsov <ekhramtsov@process-one.net>
Date: Mon, 10 Dec 2018 14:07:28 +0000 (+0300)
Subject: Merge branch 'master' into mix
X-Git-Tag: 19.02~23^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fheads%2Fmix;p=ejabberd

Merge branch 'master' into mix
---

33202d59c0cebdb09bbf81e98592a423f4caeef1