From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 4 Mar 2016 22:28:15 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=c9c66ad9b6cadbc95586dd5fe55aaea1b3b62033;p=prosody.git

Merge 0.10->trunk
---

c9c66ad9b6cadbc95586dd5fe55aaea1b3b62033