From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 10 Mar 2016 17:55:40 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=ac5c95881f73ad62a66d47dda4384fa6988b2761;p=prosody.git

Merge 0.10->trunk
---

ac5c95881f73ad62a66d47dda4384fa6988b2761