Merge pull request #2201 from zeha/api-improvements

author Peter van Dijk <peter.van.dijk@netherlabs.nl>

Mon, 9 Feb 2015 09:44:35 +0000 (10:44 +0100)

committer Peter van Dijk <peter.van.dijk@netherlabs.nl>

Mon, 9 Feb 2015 09:44:35 +0000 (10:44 +0100)
author Peter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 9 Feb 2015 09:44:35 +0000 (10:44 +0100)
committer Peter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 9 Feb 2015 09:44:35 +0000 (10:44 +0100)
diff --cc pdns/ws-auth.cc
Simple merge
diff --cc regression-tests.api/test_Zones.py
Simple merge
author	Peter van Dijk <peter.van.dijk@netherlabs.nl>
	Mon, 9 Feb 2015 09:44:35 +0000 (10:44 +0100)
committer	Peter van Dijk <peter.van.dijk@netherlabs.nl>
	Mon, 9 Feb 2015 09:44:35 +0000 (10:44 +0100)
		1	2
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.api/test_Zones.py	patch \|	diff1 \|	diff2 \|	blob \| history