From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Wed, 22 Feb 2017 16:47:00 +0000 (+0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 17.03-beta~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96a690f6072a7c03eac130b8bbb4215be0a4e8b7;p=ejabberd

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

96a690f6072a7c03eac130b8bbb4215be0a4e8b7