From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 4 Jan 2016 09:09:15 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=cb733801ad9d4ba28ed6fec5f216b9ef2063aae8;p=prosody.git

Merge 0.10->trunk
---

cb733801ad9d4ba28ed6fec5f216b9ef2063aae8