From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 22 Dec 2008 13:29:59 +0000 (+0000)
Subject: Merge from waqas
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=220a07aa19a8aa9a76ad868a90a0204e9118c4a3;p=prosody.git

Merge from waqas
---

220a07aa19a8aa9a76ad868a90a0204e9118c4a3