]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Tue, 4 Apr 2017 06:53:45 +0000 (09:53 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Tue, 4 Apr 2017 06:53:45 +0000 (09:53 +0300)

Trivial merge