Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 2 Sep 2014 20:34:32 +0000 (22:34 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 2 Sep 2014 20:34:32 +0000 (22:34 +0200)
commit163d2b9489196e5c9a532ecd4494afaddc414df6
treebaf667c100bf1a223fda332d0c6a132b72681f7a
parent59463bb9468faf882f33935c2c87d903b781be0d
parente1174c8a1637659f3447e4fa091cc1619637c8da
Merge 0.10->trunk
net/http.lua
net/server_event.lua
net/server_select.lua
plugins/mod_admin_telnet.lua