Merge pull request #6130 from pieterlexis/2018

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

Thu, 4 Jan 2018 14:21:29 +0000 (15:21 +0100)

committer GitHub <noreply@github.com>

Thu, 4 Jan 2018 14:21:29 +0000 (15:21 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 4 Jan 2018 14:21:29 +0000 (15:21 +0100)
committer GitHub <noreply@github.com>
Thu, 4 Jan 2018 14:21:29 +0000 (15:21 +0100)
diff --cc pdns/recursordist/README.md
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 4 Jan 2018 14:21:29 +0000 (15:21 +0100)
committer	GitHub <noreply@github.com>
	Thu, 4 Jan 2018 14:21:29 +0000 (15:21 +0100)
		1	2
pdns/recursordist/README.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history