Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Fri, 8 Jan 2016 15:16:08 +0000 (16:16 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 8 Jan 2016 15:16:08 +0000 (16:16 +0100)
commit1fd4988df04d0b2735c7ffce8fdd96b75929598e
tree626d516c775bb92d946247a2d01f656ed2bd15a9
parent867427d4f3fdfc12b9cb9989b6b905f37df2d76b
parent77da67a8ea5e7df5fafefcf9534ff17e22287253
Merge 0.9->0.10
net/dns.lua
plugins/mod_http_files.lua
tests/test.lua
util/ip.lua