Merge pull request #8749 from Habbie/local-ipv6-one-more-release

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

Tue, 28 Jan 2020 11:17:34 +0000 (12:17 +0100)

committer GitHub <noreply@github.com>

Tue, 28 Jan 2020 11:17:34 +0000 (12:17 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 28 Jan 2020 11:17:34 +0000 (12:17 +0100)
committer GitHub <noreply@github.com>
Tue, 28 Jan 2020 11:17:34 +0000 (12:17 +0100)
diff --cc docs/settings.rst
Simple merge
diff --cc pdns/common_startup.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 28 Jan 2020 11:17:34 +0000 (12:17 +0100)
committer	GitHub <noreply@github.com>
	Tue, 28 Jan 2020 11:17:34 +0000 (12:17 +0100)
		1	2
docs/settings.rst	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history