Merge pull request #2875 from ahupowerdns/dnsnameemp

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

Mon, 9 Nov 2015 09:20:28 +0000 (10:20 +0100)

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

Mon, 9 Nov 2015 09:20:28 +0000 (10:20 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Mon, 9 Nov 2015 09:20:28 +0000 (10:20 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Mon, 9 Nov 2015 09:20:28 +0000 (10:20 +0100)
diff --cc pdns/misc.cc
Simple merge
diff --cc pdns/misc.hh
Simple merge
diff --cc pdns/packethandler.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 9 Nov 2015 09:20:28 +0000 (10:20 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 9 Nov 2015 09:20:28 +0000 (10:20 +0100)
		1	2
pdns/misc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/misc.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/packethandler.cc	patch \|	diff1 \|	diff2 \|	blob \| history