From: Christophe Romain <christophe.romain@process-one.net>
Date: Fri, 25 Nov 2016 09:07:04 +0000 (+0100)
Subject: Merge branch 'master' of github.com:processone/ejabberd
X-Git-Tag: 16.12-beta1~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18609befa43c54f90c9e710894469d53caac81d7;p=ejabberd

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

18609befa43c54f90c9e710894469d53caac81d7