From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Tue, 21 Dec 2010 21:28:18 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/ejabberd
X-Git-Tag: ejabberd-2.1.6-2~1
X-Git-Url: http://git.onelab.eu/?p=ejabberd.git;a=commitdiff_plain;h=be2e850d661ea00b827c0e6033ada63ba1e1cade

Merge branch 'master' of ssh://git.planet-lab.org/git/ejabberd
---

be2e850d661ea00b827c0e6033ada63ba1e1cade