Merge pull request #3422 from ahupowerdns/multispoof

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

Mon, 22 Feb 2016 18:31:58 +0000 (19:31 +0100)

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

Mon, 22 Feb 2016 18:31:58 +0000 (19:31 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Mon, 22 Feb 2016 18:31:58 +0000 (19:31 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Mon, 22 Feb 2016 18:31:58 +0000 (19:31 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc regression-tests.dnsdist/test_Advanced.py
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 22 Feb 2016 18:31:58 +0000 (19:31 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 22 Feb 2016 18:31:58 +0000 (19:31 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.dnsdist/test_Advanced.py	patch \|	diff1 \|	diff2 \|	blob \| history