Merge 0.9->0.10

author Kim Alvefur <zash@zash.se>

Sun, 5 Oct 2014 13:37:21 +0000 (15:37 +0200)

committer Kim Alvefur <zash@zash.se>

Sun, 5 Oct 2014 13:37:21 +0000 (15:37 +0200)
author Kim Alvefur <zash@zash.se>
Sun, 5 Oct 2014 13:37:21 +0000 (15:37 +0200)
committer Kim Alvefur <zash@zash.se>
Sun, 5 Oct 2014 13:37:21 +0000 (15:37 +0200)
diff --cc net/dns.lua
Simple merge
diff --cc plugins/mod_admin_adhoc.lua
Simple merge
author	Kim Alvefur <zash@zash.se>
	Sun, 5 Oct 2014 13:37:21 +0000 (15:37 +0200)
committer	Kim Alvefur <zash@zash.se>
	Sun, 5 Oct 2014 13:37:21 +0000 (15:37 +0200)
		1	2
net/dns.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_admin_adhoc.lua	patch \|	diff1 \|	diff2 \|	blob \| history