Merge 0.9->0.10

author Matthew Wild <mwild1@gmail.com>

Fri, 25 Sep 2015 15:51:42 +0000 (16:51 +0100)

committer Matthew Wild <mwild1@gmail.com>

Fri, 25 Sep 2015 15:51:42 +0000 (16:51 +0100)
author Matthew Wild <mwild1@gmail.com>
Fri, 25 Sep 2015 15:51:42 +0000 (16:51 +0100)
committer Matthew Wild <mwild1@gmail.com>
Fri, 25 Sep 2015 15:51:42 +0000 (16:51 +0100)
diff --cc net/dns.lua
Simple merge
diff --cc plugins/mod_pep.lua
Simple merge
author	Matthew Wild <mwild1@gmail.com>
	Fri, 25 Sep 2015 15:51:42 +0000 (16:51 +0100)
committer	Matthew Wild <mwild1@gmail.com>
	Fri, 25 Sep 2015 15:51:42 +0000 (16:51 +0100)
		1	2
net/dns.lua	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/mod_pep.lua	patch \|	diff1 \|	diff2 \|	blob \| history