Merge pull request #3124 from pieterlexis/single-zsk-fixes

author Peter van Dijk <peter.van.dijk@powerdns.com>

Thu, 4 Feb 2016 14:58:56 +0000 (15:58 +0100)

committer Peter van Dijk <peter.van.dijk@powerdns.com>

Thu, 4 Feb 2016 14:58:56 +0000 (15:58 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 4 Feb 2016 14:58:56 +0000 (15:58 +0100)
committer Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 4 Feb 2016 14:58:56 +0000 (15:58 +0100)
diff --cc pdns/packethandler.cc
Simple merge
diff --cc pdns/packethandler.hh
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
diff --cc pdns/tcpreceiver.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 4 Feb 2016 14:58:56 +0000 (15:58 +0100)
committer	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 4 Feb 2016 14:58:56 +0000 (15:58 +0100)
		1	2
pdns/packethandler.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/packethandler.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	patch \|	diff1 \|	diff2 \|	blob \| history