From: Christophe Romain <christophe.romain@process-one.net>
Date: Thu, 30 Oct 2014 16:44:04 +0000 (+0100)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 14.12~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7819986ec0de206af7c777589c34c392a1bea2ef;p=ejabberd

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

7819986ec0de206af7c777589c34c392a1bea2ef