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

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

Conflicts:
	test/ejabberd_SUITE.erl
---

f57f267c542a8e6ddbb31cb3ba05c4fd3798f998