Changeset

2717:c5dd53b38c2f

Merge with 0.7
author Matthew Wild <mwild1@gmail.com>
date Thu, 25 Feb 2010 21:37:59 +0000
parents 2715:5e7eac7c1bda (current diff) 2716:4e4a24a1288d (diff)
children 2719:d9e3237ad30b 2990:21933063dd9f
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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"