From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 29 Jul 2009 17:11:37 +0000 (+0100)
Subject: Merge with 0.5
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=d2a52ca2a03f74964b3c54e05d22fb650327f9a1;hp=--cc;p=prosody.git

Merge with 0.5
---

d2a52ca2a03f74964b3c54e05d22fb650327f9a1