Merge 0.10->trunk

diff --cc net/http.lua
Simple merge

diff --cc net/server_event.lua
Simple merge

diff --cc net/server_select.lua
Simple merge

diff --cc plugins/mod_admin_telnet.lua
Simple merge