From: Kim Alvefur <zash@zash.se>
Date: Sat, 21 Jun 2014 13:05:52 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=3c64eae6e662e621b8ae9283ebd5ee21120a855a;p=prosody.git

Merge 0.10->trunk
---

3c64eae6e662e621b8ae9283ebd5ee21120a855a