From: Kim Alvefur <zash@zash.se>
Date: Sat, 29 Jun 2013 20:49:56 +0000 (+0200)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=ecd2e6962f8993af96ffa869659f7949e64054ae;p=prosody.git

Merge 0.9->trunk
---

ecd2e6962f8993af96ffa869659f7949e64054ae