From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 28 Apr 2013 23:36:04 +0000 (+0100)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=a60ccaf0742744800c9397d6ac3af0d2bd08a882;p=prosody.git

Merge 0.9->trunk
---

a60ccaf0742744800c9397d6ac3af0d2bd08a882