From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 4 Dec 2008 18:49:00 +0000 (+0000)
Subject: Automated merge with http://waqas.ath.cx/
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b3766306b80fa8c69e24f5426fda1634492f1363;p=prosody.git

Automated merge with http://waqas.ath.cx/
---

b3766306b80fa8c69e24f5426fda1634492f1363