From: Tobias Markmann <tm@ayena.de>
Date: Sun, 5 Jul 2009 17:05:25 +0000 (+0200)
Subject: Merge with main branch.
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=d1f8a1a9eb85c87794145d4f269373569e4eaa1e;p=prosody.git

Merge with main branch.
---

d1f8a1a9eb85c87794145d4f269373569e4eaa1e