]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorChristophe Romain <christophe.romain@process-one.net>
Fri, 25 Nov 2016 09:07:04 +0000 (10:07 +0100)
committerChristophe Romain <christophe.romain@process-one.net>
Fri, 25 Nov 2016 09:07:04 +0000 (10:07 +0100)

Trivial merge