From: xmppjingle <barata7@gmail.com>
Date: Mon, 18 Jul 2016 20:55:31 +0000 (-0300)
Subject: Merge remote-tracking branch 'processone/master'
X-Git-Tag: 16.08~30^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48c88b61b6bba511b8c4fbe63969c309047b6679;p=ejabberd

Merge remote-tracking branch 'processone/master'
---

48c88b61b6bba511b8c4fbe63969c309047b6679