Merge 0.9->0.10

author Kim Alvefur <zash@zash.se>

Sun, 9 Mar 2014 22:47:53 +0000 (23:47 +0100)

committer Kim Alvefur <zash@zash.se>

Sun, 9 Mar 2014 22:47:53 +0000 (23:47 +0100)
author Kim Alvefur <zash@zash.se>
Sun, 9 Mar 2014 22:47:53 +0000 (23:47 +0100)
committer Kim Alvefur <zash@zash.se>
Sun, 9 Mar 2014 22:47:53 +0000 (23:47 +0100)
diff --cc plugins/mod_http_files.lua
Simple merge
diff --cc util/pluginloader.lua
Simple merge
author	Kim Alvefur <zash@zash.se>
	Sun, 9 Mar 2014 22:47:53 +0000 (23:47 +0100)
committer	Kim Alvefur <zash@zash.se>
	Sun, 9 Mar 2014 22:47:53 +0000 (23:47 +0100)
		1	2
plugins/mod_http_files.lua	patch \|	diff1 \|	diff2 \|	blob \| history
util/pluginloader.lua	patch \|	diff1 \|	diff2 \|	blob \| history