]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 17 Jun 2013 18:05:31 +0000 (04:05 +1000)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 17 Jun 2013 18:05:31 +0000 (04:05 +1000)

Trivial merge