From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 2 Dec 2009 22:15:17 +0000 (+0000)
Subject: Merge with 0.6
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=c0c530b3f5d1632b4d7f2dfe53d9f8c9b49be1c5;p=prosody.git

Merge with 0.6
---

c0c530b3f5d1632b4d7f2dfe53d9f8c9b49be1c5