]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorPablo Polvorin <ppolvorin@process-one.net>
Tue, 19 Jul 2016 23:19:17 +0000 (20:19 -0300)
committerPablo Polvorin <ppolvorin@process-one.net>
Tue, 19 Jul 2016 23:19:17 +0000 (20:19 -0300)

Trivial merge