Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 8 Jul 2016 20:01:10 +0000 (22:01 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 8 Jul 2016 20:01:10 +0000 (22:01 +0200)
commit5f7b93067521c3dea61262bf8fcfc704f5e19a3f
tree50395fcf8dc52c3701e8853a71f722ec6a2f2843
parent0ca860005cbdd6841778076c1c22fd324f7f58b8
parentbeb22299c52801aa2a2bed77146b0285438cc707
Merge 0.10->trunk
net/server_select.lua
plugins/mod_admin_telnet.lua