Merge pull request #5515 from rgacogne/rec-ecs-source-0

author aerique <aerique@xs4all.nl>

Wed, 23 Aug 2017 13:43:03 +0000 (15:43 +0200)

committer GitHub <noreply@github.com>

Wed, 23 Aug 2017 13:43:03 +0000 (15:43 +0200)
author aerique <aerique@xs4all.nl>
Wed, 23 Aug 2017 13:43:03 +0000 (15:43 +0200)
committer GitHub <noreply@github.com>
Wed, 23 Aug 2017 13:43:03 +0000 (15:43 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
author	aerique <aerique@xs4all.nl>
	Wed, 23 Aug 2017 13:43:03 +0000 (15:43 +0200)
committer	GitHub <noreply@github.com>
	Wed, 23 Aug 2017 13:43:03 +0000 (15:43 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history