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

Merge 0.10->trunk
---

dd1c2bfbf0917191707327d9cc5dccf85cd5d0aa