]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Tue, 21 Feb 2017 05:46:28 +0000 (08:46 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Tue, 21 Feb 2017 05:46:28 +0000 (08:46 +0300)

Trivial merge