Merge pull request #4357 from pieterlexis/root-dnssec-data-to-header

author Remi Gacogne <rgacogne@users.noreply.github.com>

Thu, 25 Aug 2016 08:39:52 +0000 (10:39 +0200)

committer GitHub <noreply@github.com>

Thu, 25 Aug 2016 08:39:52 +0000 (10:39 +0200)
author Remi Gacogne <rgacogne@users.noreply.github.com>
Thu, 25 Aug 2016 08:39:52 +0000 (10:39 +0200)
committer GitHub <noreply@github.com>
Thu, 25 Aug 2016 08:39:52 +0000 (10:39 +0200)
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/rec-lua-conf.cc
Simple merge
author	Remi Gacogne <rgacogne@users.noreply.github.com>
	Thu, 25 Aug 2016 08:39:52 +0000 (10:39 +0200)
committer	GitHub <noreply@github.com>
	Thu, 25 Aug 2016 08:39:52 +0000 (10:39 +0200)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rec-lua-conf.cc	patch \|	diff1 \|	diff2 \|	blob \| history