From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 4 Jan 2016 09:14:57 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=272ab3027651e4d326662b8ec5058edfe8ba93ea;p=prosody.git

Merge 0.10->trunk
---

272ab3027651e4d326662b8ec5058edfe8ba93ea