From: Kim Alvefur <zash@zash.se>
Date: Tue, 5 Apr 2016 10:48:36 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=92dda9fa87f88da2a374ed3ad3feca16d603f360;p=prosody.git

Merge 0.10->trunk
---

92dda9fa87f88da2a374ed3ad3feca16d603f360