]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorChristophe Romain <christophe.romain@process-one.net>
Mon, 5 May 2014 16:42:49 +0000 (18:42 +0200)
committerChristophe Romain <christophe.romain@process-one.net>
Mon, 5 May 2014 16:42:49 +0000 (18:42 +0200)

Trivial merge