]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of https://github.com/joudinet/ejabberd into joudinet-master
authorChristophe Romain <christophe.romain@process-one.net>
Tue, 30 May 2017 10:37:27 +0000 (12:37 +0200)
committerChristophe Romain <christophe.romain@process-one.net>
Tue, 30 May 2017 10:37:27 +0000 (12:37 +0200)

Trivial merge