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

Merge branch 'master' into mix
---

74e8c0376f8d3d292205a1b7ab1908570c4272f1