]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Tue, 15 Mar 2016 21:42:15 +0000 (22:42 +0100)
committerMickael Remond <mremond@process-one.net>
Tue, 15 Mar 2016 21:42:15 +0000 (22:42 +0100)

Trivial merge