Merge remote-tracking branch 'origin/master' into auth-rm-out-of-zone-processing

author Pieter Lexis <pieter.lexis@powerdns.com>

Wed, 14 Nov 2018 12:09:24 +0000 (13:09 +0100)

committer Pieter Lexis <pieter.lexis@powerdns.com>

Wed, 14 Nov 2018 12:09:24 +0000 (13:09 +0100)
author Pieter Lexis <pieter.lexis@powerdns.com>
Wed, 14 Nov 2018 12:09:24 +0000 (13:09 +0100)
committer Pieter Lexis <pieter.lexis@powerdns.com>
Wed, 14 Nov 2018 12:09:24 +0000 (13:09 +0100)
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/common_startup.cc
Simple merge
author	Pieter Lexis <pieter.lexis@powerdns.com>
	Wed, 14 Nov 2018 12:09:24 +0000 (13:09 +0100)
committer	Pieter Lexis <pieter.lexis@powerdns.com>
	Wed, 14 Nov 2018 12:09:24 +0000 (13:09 +0100)
		1	2
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history