From: Kim Alvefur <zash@zash.se>
Date: Sat, 22 Aug 2015 19:01:00 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=12b457bd8dc0f23e9e51c65858925ee30368d571;p=prosody.git

Merge 0.10->trunk
---

12b457bd8dc0f23e9e51c65858925ee30368d571