From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 26 Mar 2016 20:17:59 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b894a262724d2912d61f2499aba6b134d572ae47;p=prosody.git

Merge 0.10->trunk
---

b894a262724d2912d61f2499aba6b134d572ae47