From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 25 Nov 2009 17:40:24 +0000 (+0000)
Subject: Merge with trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=72a98d4f123a3d7c2822ba1a96f096c43ae393ce;p=prosody.git

Merge with trunk
---

72a98d4f123a3d7c2822ba1a96f096c43ae393ce