From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 21 Feb 2010 16:43:05 +0000 (+0000)
Subject: Merge with 0.7
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=f17014be481d9a660bb8ceb84d906a07a7699d9b;p=prosody.git

Merge with 0.7
---

f17014be481d9a660bb8ceb84d906a07a7699d9b