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

Merge 0.10->trunk
---

f6f011dfbc3d179c77c0431ffacfaaf091f18053