]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 30 Oct 2015 14:20:50 +0000 (17:20 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 30 Oct 2015 14:20:50 +0000 (17:20 +0300)

Trivial merge