From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 5 Mar 2016 20:50:17 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=127df5431789381b960207d7c853df2a4f1b9cc9;p=prosody.git

Merge 0.10->trunk
---

127df5431789381b960207d7c853df2a4f1b9cc9