Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 20 Aug 2015 11:05:22 +0000 (13:05 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 20 Aug 2015 11:05:22 +0000 (13:05 +0200)
commitb036bd73d513b77e3b4c583e25ee331ec57a610d
treecc93786bc99f03a9cd4468db8215b2871dd19ec6
parentd1c11394c1992c53c010b869b7a8260b96fda659
parent26117bccb6173cdc8e2bb8ad388c40c7ea330085
Merge 0.10->trunk
core/hostmanager.lua
core/moduleapi.lua
core/storagemanager.lua
net/http.lua
net/server_event.lua
plugins/mod_admin_telnet.lua
util/timer.lua