]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Sun, 27 Jul 2014 09:06:46 +0000 (13:06 +0400)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Sun, 27 Jul 2014 09:06:46 +0000 (13:06 +0400)

Trivial merge