]> granicus.if.org Git - ejabberd/commitdiff
Rebase master
authorMickael Remond <mremond@process-one.net>
Wed, 6 Apr 2016 16:14:47 +0000 (18:14 +0200)
committerMickael Remond <mremond@process-one.net>
Wed, 6 Apr 2016 16:14:47 +0000 (18:14 +0200)

Trivial merge