From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 10 Aug 2009 13:29:28 +0000 (+0100)
Subject: Merge with Tobias
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=4fad5c57e16d8772a19d309bd3bdb3d11c6ece8f;p=prosody.git

Merge with Tobias
---

4fad5c57e16d8772a19d309bd3bdb3d11c6ece8f