From: Tobias Markmann <tm@ayena.de>
Date: Sun, 30 Nov 2008 16:18:31 +0000 (+0100)
Subject: Automerge with waqas.
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=8c0f83a934f6ac36543b0db7dcd450a62a535123;p=prosody.git

Automerge with waqas.
---

8c0f83a934f6ac36543b0db7dcd450a62a535123