]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorChristophe Romain <christophe.romain@process-one.net>
Fri, 18 Sep 2015 07:06:51 +0000 (09:06 +0200)
committerChristophe Romain <christophe.romain@process-one.net>
Fri, 18 Sep 2015 07:06:51 +0000 (09:06 +0200)

Trivial merge