Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge with 0.7
Thu, 25 Feb 2010 21:37:59 +0000
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Thu, 25 Feb 2010 21:37:59 +0000
- changeset 2717
- c5dd53b38c2f
- parent 2715
- 5e7eac7c1bda (current diff)
- parent 2716
- 4e4a24a1288d (diff)
- child 2719
- d9e3237ad30b
- child 2990
- 21933063dd9f
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"
