From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 3 Dec 2015 16:13:33 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=73dc553be7d632b46c2523d90cd1414a58b50600;p=prosody.git

Merge 0.10->trunk
---

73dc553be7d632b46c2523d90cd1414a58b50600