Merge pull request #4564 from rgacogne/rec-public-dnsquestion

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

Thu, 8 Dec 2016 14:09:47 +0000 (15:09 +0100)

committer GitHub <noreply@github.com>

Thu, 8 Dec 2016 14:09:47 +0000 (15:09 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 8 Dec 2016 14:09:47 +0000 (15:09 +0100)
committer GitHub <noreply@github.com>
Thu, 8 Dec 2016 14:09:47 +0000 (15:09 +0100)
diff --cc pdns/lua-recursor4.cc
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 8 Dec 2016 14:09:47 +0000 (15:09 +0100)
committer	GitHub <noreply@github.com>
	Thu, 8 Dec 2016 14:09:47 +0000 (15:09 +0100)
		1	2
pdns/lua-recursor4.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history