]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 23 Jan 2017 18:52:35 +0000 (21:52 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 23 Jan 2017 18:52:35 +0000 (21:52 +0300)

Trivial merge