From: Matthew Wild Date: Fri, 3 Jun 2011 04:36:44 +0000 (+0100) Subject: Merge with Florob X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=5c0df6fdbf035a2b91765aa22c2c67e767543792;p=prosody.git Merge with Florob --- 5c0df6fdbf035a2b91765aa22c2c67e767543792