Merge with Zash

author Matthew Wild <mwild1@gmail.com>

Sun, 22 Jul 2012 17:47:40 +0000 (18:47 +0100)

committer Matthew Wild <mwild1@gmail.com>

Sun, 22 Jul 2012 17:47:40 +0000 (18:47 +0100)
author Matthew Wild <mwild1@gmail.com>
Sun, 22 Jul 2012 17:47:40 +0000 (18:47 +0100)
committer Matthew Wild <mwild1@gmail.com>
Sun, 22 Jul 2012 17:47:40 +0000 (18:47 +0100)
diff --cc net/http.lua
Simple merge
diff --cc plugins/mod_admin_telnet.lua
Simple merge
author	Matthew Wild <mwild1@gmail.com>
	Sun, 22 Jul 2012 17:47:40 +0000 (18:47 +0100)
committer	Matthew Wild <mwild1@gmail.com>
	Sun, 22 Jul 2012 17:47:40 +0000 (18:47 +0100)
		1	2
net/http.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_admin_telnet.lua	patch \|	diff1 \|	diff2 \|	blob \| history