From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 11 Jan 2011 05:31:29 +0000 (+0000)
Subject: Merge 0.8->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=8e90ab391112aa88164f8332a6b52d29aa9d6bde;hp=c0d63b78911a777a57bd018358408156f383a3f9;p=prosody.git

Merge 0.8->trunk
---