From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Mon, 21 Nov 2016 09:14:37 +0000 (+0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 16.12-beta1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6365979bd1fcd042a1c59d0d0f782c0a4651412;p=ejabberd

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

e6365979bd1fcd042a1c59d0d0f782c0a4651412