From: Kim Alvefur <zash@zash.se>
Date: Sat, 22 Nov 2014 10:53:14 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=e89b852ba44f843cb37c1908892680580d9f18ff;p=prosody.git

Merge 0.10->trunk
---

e89b852ba44f843cb37c1908892680580d9f18ff