From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 13 Feb 2011 22:59:27 +0000 (+0000)
Subject: Merge 0.8->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b9cc81a697a8881cb02ea59acf8bff8297e25151;p=prosody.git

Merge 0.8->trunk
---

b9cc81a697a8881cb02ea59acf8bff8297e25151