Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sun, 9 Mar 2014 22:47:53 +0000 (23:47 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 9 Mar 2014 22:47:53 +0000 (23:47 +0100)
commitfea2a20a1c12fe7415426658e55095fee94fe656
tree20c519fa6c4ac685cd15873b834b46c04f3a2df9
parent534b96bd98ed38320b5236baba3e1459498cb11a
parent80433ad5d309c052274d943269b6d56a7d45cea0
Merge 0.9->0.10
plugins/mod_http_files.lua
util/pluginloader.lua