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

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

3908a80ac9ec5c05328af1b873dfeda20861c935