Merge 0.10->trunk

author Kim Alvefur <zash@zash.se>

Sun, 10 Jan 2016 02:57:17 +0000 (03:57 +0100)

committer Kim Alvefur <zash@zash.se>

Sun, 10 Jan 2016 02:57:17 +0000 (03:57 +0100)
author Kim Alvefur <zash@zash.se>
Sun, 10 Jan 2016 02:57:17 +0000 (03:57 +0100)
committer Kim Alvefur <zash@zash.se>
Sun, 10 Jan 2016 02:57:17 +0000 (03:57 +0100)
diff --cc net/server_select.lua
Simple merge
diff --cc plugins/mod_admin_telnet.lua
Simple merge
author	Kim Alvefur <zash@zash.se>
	Sun, 10 Jan 2016 02:57:17 +0000 (03:57 +0100)
committer	Kim Alvefur <zash@zash.se>
	Sun, 10 Jan 2016 02:57:17 +0000 (03:57 +0100)
		1	2
net/server_select.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_admin_telnet.lua	patch \|	diff1 \|	diff2 \|	blob \| history