From: Jerome Sautret <jerome.sautret@process-one.net>
Date: Thu, 30 Oct 2014 16:19:37 +0000 (+0100)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 14.12~25^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b0d8b77769d5bd532fb14abf0641a8e5c8e1cfd;p=ejabberd

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

5b0d8b77769d5bd532fb14abf0641a8e5c8e1cfd