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)
commitbe2e850d661ea00b827c0e6033ada63ba1e1cade
treee9a9696451eff96d2485b0dd8575f83b08774429
parenta942678f3b7bf1829430bdccd75468135ad21342
parentb901f16ce55ebcb2ad6f29cb81bf7f42e38844d6
Merge branch 'master' of ssh://git.planet-lab.org/git/ejabberd