From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 May 2016 01:16:57 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=ba884557ec95b3720a68b962756e289b82bf15c5

Merge 0.10->trunk
---

ba884557ec95b3720a68b962756e289b82bf15c5