]> 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>
Mon, 1 Nov 2010 13:23:01 +0000 (22:23 +0900)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 1 Nov 2010 13:23:01 +0000 (22:23 +0900)

Trivial merge