]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Wed, 6 Apr 2016 15:56:01 +0000 (17:56 +0200)
committerMickael Remond <mremond@process-one.net>
Wed, 6 Apr 2016 15:56:01 +0000 (17:56 +0200)

Trivial merge