]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 21 Nov 2016 09:14:37 +0000 (12:14 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 21 Nov 2016 09:14:37 +0000 (12:14 +0300)

Trivial merge