From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Mon, 16 Jan 2017 15:15:08 +0000 (+0300)
Subject: Merge branch 'new_stream' of github.com:processone/ejabberd into new_stream
X-Git-Tag: 17.03-beta~91^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a849b384f828a012616d757606e3201c15d4df0c;p=ejabberd

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

a849b384f828a012616d757606e3201c15d4df0c