From: Kim Alvefur <zash@zash.se>
Date: Tue, 3 Sep 2013 11:43:39 +0000 (+0200)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=0ae741529413e2f621d1be47c6c479c58416f1c1;p=prosody.git

Merge 0.9->trunk
---

0ae741529413e2f621d1be47c6c479c58416f1c1