From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 1 Feb 2016 21:28:07 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=77c4d4f8f30de6e8a1da79d28484cd333f728829;p=prosody.git

Merge 0.10->trunk
---

77c4d4f8f30de6e8a1da79d28484cd333f728829