From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 13 Jun 2013 22:24:36 +0000 (+0100)
Subject: Merge the merge
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=313b61ae6320a330096992127a9658f959bcd977;p=prosody.git

Merge the merge
---

313b61ae6320a330096992127a9658f959bcd977