Merge pull request #4924 from ahupowerdns/ednstune

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

Wed, 25 Jan 2017 14:14:42 +0000 (15:14 +0100)

committer GitHub <noreply@github.com>

Wed, 25 Jan 2017 14:14:42 +0000 (15:14 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Wed, 25 Jan 2017 14:14:42 +0000 (15:14 +0100)
committer GitHub <noreply@github.com>
Wed, 25 Jan 2017 14:14:42 +0000 (15:14 +0100)
diff --cc pdns/iputils.hh
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Wed, 25 Jan 2017 14:14:42 +0000 (15:14 +0100)
committer	GitHub <noreply@github.com>
	Wed, 25 Jan 2017 14:14:42 +0000 (15:14 +0100)
		1	2
pdns/iputils.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history