From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 26 Nov 2008 21:49:17 +0000 (+0000)
Subject: Merge from waqas
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=617867e56861ce61c55c894b4b881ab3ed0050ef;hp=-c;p=prosody.git

Merge from waqas
---

617867e56861ce61c55c894b4b881ab3ed0050ef