Merge pull request #5182 from pieterlexis/issue-5119-disable-ALIAS

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

Tue, 21 Mar 2017 13:10:25 +0000 (14:10 +0100)

committer GitHub <noreply@github.com>

Tue, 21 Mar 2017 13:10:25 +0000 (14:10 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 21 Mar 2017 13:10:25 +0000 (14:10 +0100)
committer GitHub <noreply@github.com>
Tue, 21 Mar 2017 13:10:25 +0000 (14:10 +0100)
diff --cc docs/markdown/authoritative/settings.md
Simple merge
diff --cc pdns/common_startup.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 21 Mar 2017 13:10:25 +0000 (14:10 +0100)
committer	GitHub <noreply@github.com>
	Tue, 21 Mar 2017 13:10:25 +0000 (14:10 +0100)
		1	2
docs/markdown/authoritative/settings.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/common_startup.cc	patch \|	diff1 \|	diff2 \|	blob \| history