Merge pull request #4044 from cmouse/dnspacket-comboaddr

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

Tue, 19 Jul 2016 19:48:32 +0000 (21:48 +0200)

committer GitHub <noreply@github.com>

Tue, 19 Jul 2016 19:48:32 +0000 (21:48 +0200)
author bert hubert <bert.hubert@netherlabs.nl>
Tue, 19 Jul 2016 19:48:32 +0000 (21:48 +0200)
committer GitHub <noreply@github.com>
Tue, 19 Jul 2016 19:48:32 +0000 (21:48 +0200)
diff --cc pdns/packethandler.cc
Simple merge
diff --cc pdns/tcpreceiver.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Tue, 19 Jul 2016 19:48:32 +0000 (21:48 +0200)
committer	GitHub <noreply@github.com>
	Tue, 19 Jul 2016 19:48:32 +0000 (21:48 +0200)
		1	2
pdns/packethandler.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/tcpreceiver.cc	patch \|	diff1 \|	diff2 \|	blob \| history