From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Tue, 4 Apr 2017 06:53:45 +0000 (+0300)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 17.04~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a0b4ad8daddf231a1a9660752cbed00fe62d41c;p=ejabberd

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

3a0b4ad8daddf231a1a9660752cbed00fe62d41c