]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 7 Nov 2016 07:11:40 +0000 (10:11 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 7 Nov 2016 07:11:40 +0000 (10:11 +0300)

Trivial merge