Merge branch 'master' of ssh://git.planet-lab.org/git/ejabberd
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 21 Dec 2010 21:28:18 +0000 (16:28 -0500)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Tue, 21 Dec 2010 21:28:18 +0000 (16:28 -0500)

Trivial merge