Merge from waqas

This commit is contained in:
Matthew Wild 2008-12-03 15:09:58 +00:00
commit e9c064e355
63 changed files with 1149 additions and 78 deletions

View file

@ -49,7 +49,7 @@ Host "*"
"ping"; -- XMPP Ping
"time"; -- Let others know the time here
"uptime"; -- Uptime reporting
"console"; -- telnet to port 5528 (needs console_enabled = true)
"console"; -- telnet to port 5582 (needs console_enabled = true)
};
-- These are the SSL/TLS-related settings. If you don't want
@ -75,4 +75,4 @@ Host "example.com"
}
enabled = false -- This will disable the host, preserving the config, but denying connections
>>>>>>> other