Merge pull request #4647 from pieterlexis/backport-4629

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

Fri, 9 Dec 2016 08:59:00 +0000 (09:59 +0100)

committer GitHub <noreply@github.com>

Fri, 9 Dec 2016 08:59:00 +0000 (09:59 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Fri, 9 Dec 2016 08:59:00 +0000 (09:59 +0100)
committer GitHub <noreply@github.com>
Fri, 9 Dec 2016 08:59:00 +0000 (09:59 +0100)
diff --cc pdns/syncres.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Fri, 9 Dec 2016 08:59:00 +0000 (09:59 +0100)
committer	GitHub <noreply@github.com>
	Fri, 9 Dec 2016 08:59:00 +0000 (09:59 +0100)
		1	2
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history