From: Kim Alvefur <zash@zash.se>
Date: Sun, 12 Jun 2016 18:06:30 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=455af00e41f1766abea5475e1be44f17a57e0879

Merge 0.10->trunk
---

455af00e41f1766abea5475e1be44f17a57e0879