From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 24 Aug 2013 22:16:08 +0000 (+0100)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=51692a2fc9586fb26fefa54982dec80c21dac059;p=prosody.git

Merge 0.9->trunk
---

51692a2fc9586fb26fefa54982dec80c21dac059