From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 3 Jan 2010 15:17:51 +0000 (+0000)
Subject: Merge with Rob
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=897312fb8f983c0dffb10cd31609d39a8396d0d3;p=prosody.git

Merge with Rob
---

897312fb8f983c0dffb10cd31609d39a8396d0d3