From: Kim Alvefur <zash@zash.se>
Date: Sat, 2 Apr 2016 15:13:12 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=dcafa6940b57fdbd0ebd4c09bfb3b6122752be19;p=prosody.git

Merge 0.10->trunk
---

dcafa6940b57fdbd0ebd4c09bfb3b6122752be19