From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 2 Sep 2015 17:55:35 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=97043cc758d50d7c918b97057eded3e7ad0c090b;p=prosody.git

Merge 0.10->trunk
---

97043cc758d50d7c918b97057eded3e7ad0c090b