From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 27 Apr 2013 12:11:27 +0000 (+0100)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=e1df7aa58e48e9dddb151cebef0774adf0d68d37;p=prosody.git

Merge 0.9->trunk
---

e1df7aa58e48e9dddb151cebef0774adf0d68d37