Merge pull request #5810 from pieterlexis/b2b-migrate-bind-fixes

author aerique <aerique@xs4all.nl>

Thu, 2 Nov 2017 11:22:47 +0000 (12:22 +0100)

committer GitHub <noreply@github.com>

Thu, 2 Nov 2017 11:22:47 +0000 (12:22 +0100)
author aerique <aerique@xs4all.nl>
Thu, 2 Nov 2017 11:22:47 +0000 (12:22 +0100)
committer GitHub <noreply@github.com>
Thu, 2 Nov 2017 11:22:47 +0000 (12:22 +0100)
diff --cc modules/bindbackend/bindbackend2.cc
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
author	aerique <aerique@xs4all.nl>
	Thu, 2 Nov 2017 11:22:47 +0000 (12:22 +0100)
committer	GitHub <noreply@github.com>
	Thu, 2 Nov 2017 11:22:47 +0000 (12:22 +0100)
		1	2
modules/bindbackend/bindbackend2.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history