From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Mon, 23 Jan 2017 18:52:35 +0000 (+0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 17.03-beta~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e2c1053968ce882d793e4da101ae09c1a9f2afc;p=ejabberd

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

5e2c1053968ce882d793e4da101ae09c1a9f2afc