]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Thu, 8 May 2014 17:40:14 +0000 (21:40 +0400)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Thu, 8 May 2014 17:40:14 +0000 (21:40 +0400)

Trivial merge