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

Merge 0.10->trunk
---

2b120230b5ec5bcd129344ae908e73b89867d600