Merge pull request #7081 from mind04/offset

author Peter van Dijk <peter.van.dijk@powerdns.com>

Tue, 6 Nov 2018 22:47:32 +0000 (23:47 +0100)

committer GitHub <noreply@github.com>

Tue, 6 Nov 2018 22:47:32 +0000 (23:47 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 6 Nov 2018 22:47:32 +0000 (23:47 +0100)
committer GitHub <noreply@github.com>
Tue, 6 Nov 2018 22:47:32 +0000 (23:47 +0100)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/recursordist/docs/settings.rst
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 6 Nov 2018 22:47:32 +0000 (23:47 +0100)
committer	GitHub <noreply@github.com>
	Tue, 6 Nov 2018 22:47:32 +0000 (23:47 +0100)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history