Merge pull request #7918 from mind04/soacomplete

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

Mon, 1 Jul 2019 08:33:36 +0000 (10:33 +0200)

committer GitHub <noreply@github.com>

Mon, 1 Jul 2019 08:33:36 +0000 (10:33 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Mon, 1 Jul 2019 08:33:36 +0000 (10:33 +0200)
committer GitHub <noreply@github.com>
Mon, 1 Jul 2019 08:33:36 +0000 (10:33 +0200)
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Mon, 1 Jul 2019 08:33:36 +0000 (10:33 +0200)
committer	GitHub <noreply@github.com>
	Mon, 1 Jul 2019 08:33:36 +0000 (10:33 +0200)
		1	2
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history