Merge 0.9->0.10

author Kim Alvefur <zash@zash.se>

Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)

committer Kim Alvefur <zash@zash.se>

Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)
author Kim Alvefur <zash@zash.se>
Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)
committer Kim Alvefur <zash@zash.se>
Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)
diff --cc net/dns.lua
Simple merge
diff --cc plugins/mod_s2s/s2sout.lib.lua
Simple merge
author	Kim Alvefur <zash@zash.se>
	Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)
committer	Kim Alvefur <zash@zash.se>
	Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)
		1	2
net/dns.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_s2s/s2sout.lib.lua	patch \|	diff1 \|	diff2 \|	blob \| history