]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorChristophe Romain <christophe.romain@process-one.net>
Mon, 23 Feb 2015 14:52:23 +0000 (15:52 +0100)
committerChristophe Romain <christophe.romain@process-one.net>
Mon, 23 Feb 2015 14:52:23 +0000 (15:52 +0100)

Trivial merge