Merge pull request #3086 from cmouse/recursor-fixes

author bert hubert <bert.hubert@netherlabs.nl>

Tue, 12 Jan 2016 20:11:08 +0000 (21:11 +0100)

committer bert hubert <bert.hubert@netherlabs.nl>

Tue, 12 Jan 2016 20:11:08 +0000 (21:11 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Tue, 12 Jan 2016 20:11:08 +0000 (21:11 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Tue, 12 Jan 2016 20:11:08 +0000 (21:11 +0100)
diff --cc pdns/filterpo.cc
Simple merge
diff --cc pdns/rpzloader.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Tue, 12 Jan 2016 20:11:08 +0000 (21:11 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Tue, 12 Jan 2016 20:11:08 +0000 (21:11 +0100)
		1	2
pdns/filterpo.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rpzloader.cc	patch \|	diff1 \|	diff2 \|	blob \| history