From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 3 Sep 2014 17:50:20 +0000 (+0100)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=eef946a630913dcf09a23233b8a7a253c2cf3b64;p=prosody.git

Merge 0.9->0.10
---

eef946a630913dcf09a23233b8a7a253c2cf3b64