Thu, 25 Feb 2010 21:37:59 +0000
Merge with 0.7
--- a/prosody.cfg.lua.dist Thu Feb 25 18:08:59 2010 +0000 +++ b/prosody.cfg.lua.dist Thu Feb 25 21:37:59 2010 +0000 @@ -135,4 +135,4 @@ --Component "conference.example.com" "muc" -- Set up a SOCKS5 bytestream proxy for server-proxied file transfers: ---Component "proxy.example.com "proxy65" +--Component "proxy.example.com" "proxy65"