Merge pull request #1427 from zeha/api-delete-204

author Peter van Dijk <peter@7bits.nl>

Thu, 22 May 2014 10:12:58 +0000 (12:12 +0200)

committer Peter van Dijk <peter@7bits.nl>

Thu, 22 May 2014 10:12:58 +0000 (12:12 +0200)
author Peter van Dijk <peter@7bits.nl>
Thu, 22 May 2014 10:12:58 +0000 (12:12 +0200)
committer Peter van Dijk <peter@7bits.nl>
Thu, 22 May 2014 10:12:58 +0000 (12:12 +0200)
diff --cc pdns/ws-auth.cc
Simple merge
diff --cc pdns/ws-recursor.cc
Simple merge
diff --cc regression-tests.api/test_Zones.py
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Thu, 22 May 2014 10:12:58 +0000 (12:12 +0200)
committer	Peter van Dijk <peter@7bits.nl>
	Thu, 22 May 2014 10:12:58 +0000 (12:12 +0200)
		1	2
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.api/test_Zones.py	patch \|	diff1 \|	diff2 \|	blob \| history