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

Trivial merge