]> granicus.if.org Git - ejabberd/commitdiff
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into...
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Sun, 24 Oct 2010 05:30:37 +0000 (15:30 +1000)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Sun, 24 Oct 2010 05:30:37 +0000 (15:30 +1000)

Trivial merge