Merge remote-tracking branch 'origin/master' into extra-warnings

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

Mon, 21 Jan 2019 09:20:56 +0000 (10:20 +0100)

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

Mon, 21 Jan 2019 09:20:56 +0000 (10:20 +0100)
author Pieter Lexis <pieter.lexis@powerdns.com>
Mon, 21 Jan 2019 09:20:56 +0000 (10:20 +0100)
committer Pieter Lexis <pieter.lexis@powerdns.com>
Mon, 21 Jan 2019 09:20:56 +0000 (10:20 +0100)
diff --cc build-scripts/jsoref-spellchecker/whitelist.words
Simple merge
diff --cc pdns/dnsdist-lua-bindings.cc
Simple merge
diff --cc pdns/dnsscope.cc
Simple merge
author	Pieter Lexis <pieter.lexis@powerdns.com>
	Mon, 21 Jan 2019 09:20:56 +0000 (10:20 +0100)
committer	Pieter Lexis <pieter.lexis@powerdns.com>
	Mon, 21 Jan 2019 09:20:56 +0000 (10:20 +0100)
		1	2
build-scripts/jsoref-spellchecker/whitelist.words	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua-bindings.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsscope.cc	patch \|	diff1 \|	diff2 \|	blob \| history