# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1267133879 0
# Node ID c5dd53b38c2f7fe0c5f331789cfb366128d289b5
# Parent  5e7eac7c1bdaa51c82bb25b1c708749e924b92d8# Parent  4e4a24a1288d06f438df152b9309cd9ae7a3cb60
Merge with 0.7

diff -r 5e7eac7c1bda -r c5dd53b38c2f prosody.cfg.lua.dist
--- 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"