]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of git+ssh://gitorious.process-one.net/ejabberd/mainline
authorChristophe Romain <christophe.romain@process-one.net>
Mon, 21 Feb 2011 13:45:44 +0000 (14:45 +0100)
committerChristophe Romain <christophe.romain@process-one.net>
Mon, 21 Feb 2011 13:45:44 +0000 (14:45 +0100)

Trivial merge