From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 27 Jan 2016 20:38:09 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b244d865c10f013995fa3615cd9ddc019c352d55;p=prosody.git

Merge 0.10->trunk
---

b244d865c10f013995fa3615cd9ddc019c352d55