From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 18 Feb 2016 13:49:19 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=f75973e6831d45018dc2c704d01da9a57701737a;p=prosody.git

Merge 0.10->trunk
---

f75973e6831d45018dc2c704d01da9a57701737a