From: Kim Alvefur <zash@zash.se>
Date: Wed, 17 Apr 2013 17:11:57 +0000 (+0200)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=c4d2cdb82ad0c54e36c36c8a346d622aa8a4bb87;p=prosody.git

Merge 0.9->trunk
---

c4d2cdb82ad0c54e36c36c8a346d622aa8a4bb87