Merge 0.6.2/waqas with 0.6.2/MattJ
authorMatthew Wild <mwild1@gmail.com>
Wed, 3 Mar 2010 22:05:05 +0000 (22:05 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 3 Mar 2010 22:05:05 +0000 (22:05 +0000)
commitb758596b055327e0708c763a8a2b31616bc2ee04
tree9fa8e123725a8be92fb7473248052b8f3c64740e
parent03054d241a716c5fee3c9034931c082601dbf858
parent7142305037efe46c2c12511d1c9c5b8108f0fb90
Merge 0.6.2/waqas with 0.6.2/MattJ
core/hostmanager.lua
core/s2smanager.lua
net/dns.lua
net/httpserver.lua
net/xmppserver_listener.lua
plugins/mod_saslauth.lua
plugins/mod_tls.lua
prosody