]> granicus.if.org Git - ejabberd/commitdiff
Merge remote-tracking branch 'processone/master'
authorxmppjingle <barata7@gmail.com>
Mon, 18 Jul 2016 20:55:31 +0000 (17:55 -0300)
committerxmppjingle <barata7@gmail.com>
Mon, 18 Jul 2016 20:55:31 +0000 (17:55 -0300)

Trivial merge