Merge pull request #4377 from pieterlexis/issue-4369-DNSSEC-forwards-cache

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Thu, 20 Oct 2016 11:58:01 +0000 (13:58 +0200)

committer GitHub <noreply@github.com>

Thu, 20 Oct 2016 11:58:01 +0000 (13:58 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 20 Oct 2016 11:58:01 +0000 (13:58 +0200)
committer GitHub <noreply@github.com>
Thu, 20 Oct 2016 11:58:01 +0000 (13:58 +0200)
diff --cc docs/markdown/recursor/settings.md
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Thu, 20 Oct 2016 11:58:01 +0000 (13:58 +0200)
committer	GitHub <noreply@github.com>
	Thu, 20 Oct 2016 11:58:01 +0000 (13:58 +0200)
		1	2
docs/markdown/recursor/settings.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history