From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Mon, 7 Nov 2016 07:11:40 +0000 (+0300)
Subject: Merge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng
X-Git-Tag: 16.12-beta1~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9dd3ffe9c67da80ce8c9046427e599640c1a23b;p=ejabberd

Merge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng
---

e9dd3ffe9c67da80ce8c9046427e599640c1a23b