From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 4 Sep 2015 10:11:40 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=bbb6e2bcbcec687dfbcd27e273a26223bb0471d9;p=prosody.git

Merge 0.10->trunk
---

bbb6e2bcbcec687dfbcd27e273a26223bb0471d9