Merge pull request #6168 from phonedph1/forward-nsspeed

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

Tue, 23 Jan 2018 11:22:24 +0000 (12:22 +0100)

committer GitHub <noreply@github.com>

Tue, 23 Jan 2018 11:22:24 +0000 (12:22 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 23 Jan 2018 11:22:24 +0000 (12:22 +0100)
committer GitHub <noreply@github.com>
Tue, 23 Jan 2018 11:22:24 +0000 (12:22 +0100)
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 23 Jan 2018 11:22:24 +0000 (12:22 +0100)
committer	GitHub <noreply@github.com>
	Tue, 23 Jan 2018 11:22:24 +0000 (12:22 +0100)
		1	2
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history