Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 10 Jan 2016 02:57:17 +0000 (03:57 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 10 Jan 2016 02:57:17 +0000 (03:57 +0100)
commit5082d3041ff66a8b54e799af2194b9b64b7c29bb
tree017d6117a30f563b4f268bba2c20025df82d11e7
parenta8ed035a194773d87b973b9b4f1cae40c6ae5d8a
parent2bebab001ec790bb7a49053cc404cd1780e2c888
Merge 0.10->trunk
net/server_select.lua
plugins/mod_admin_telnet.lua