From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 23 Mar 2016 12:19:23 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=eafb468ddf424ee527ab137e088c97d9d553bd92;p=prosody.git

Merge 0.10->trunk
---

eafb468ddf424ee527ab137e088c97d9d553bd92