From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 10 Dec 2015 18:58:30 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=d0825240c38cd809aaee5b3e84b75ad4007ef478;p=prosody.git

Merge 0.10->trunk
---

d0825240c38cd809aaee5b3e84b75ad4007ef478