]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 28 Feb 2014 11:36:46 +0000 (15:36 +0400)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 28 Feb 2014 11:36:46 +0000 (15:36 +0400)

Trivial merge