Merge 0.9->0.10

author Kim Alvefur <zash@zash.se>

Mon, 30 Jun 2014 11:11:01 +0000 (13:11 +0200)

committer Kim Alvefur <zash@zash.se>

Mon, 30 Jun 2014 11:11:01 +0000 (13:11 +0200)
author Kim Alvefur <zash@zash.se>
Mon, 30 Jun 2014 11:11:01 +0000 (13:11 +0200)
committer Kim Alvefur <zash@zash.se>
Mon, 30 Jun 2014 11:11:01 +0000 (13:11 +0200)
diff --cc net/adns.lua
Simple merge
diff --cc net/dns.lua
Simple merge
author	Kim Alvefur <zash@zash.se>
	Mon, 30 Jun 2014 11:11:01 +0000 (13:11 +0200)
committer	Kim Alvefur <zash@zash.se>
	Mon, 30 Jun 2014 11:11:01 +0000 (13:11 +0200)
		1	2
net/adns.lua	patch \|	diff1 \|	diff2 \|	blob \| history
net/dns.lua	patch \|	diff1 \|	diff2 \|	blob \| history