From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 8 Jul 2015 23:14:27 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=f0bfbf31b1268b391de20f44cef150323a0b724b;p=prosody.git

Merge 0.10->trunk
---

f0bfbf31b1268b391de20f44cef150323a0b724b