]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorMickael Remond <mremond@process-one.net>
Mon, 25 Jan 2016 09:47:29 +0000 (10:47 +0100)
committerMickael Remond <mremond@process-one.net>
Mon, 25 Jan 2016 09:47:29 +0000 (10:47 +0100)

Trivial merge