From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 18 Mar 2016 14:03:35 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=155b53a0ca5b6c7ed484a142bb4e9fed1a2636cd;p=prosody.git

Merge 0.10->trunk
---

155b53a0ca5b6c7ed484a142bb4e9fed1a2636cd