Merge pull request #4781 from zeha/api-comment-zero-ttl

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Tue, 20 Dec 2016 12:36:48 +0000 (13:36 +0100)

committer GitHub <noreply@github.com>

Tue, 20 Dec 2016 12:36:48 +0000 (13:36 +0100)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 20 Dec 2016 12:36:48 +0000 (13:36 +0100)
committer GitHub <noreply@github.com>
Tue, 20 Dec 2016 12:36:48 +0000 (13:36 +0100)
diff --cc pdns/ws-auth.cc
Simple merge
diff --cc regression-tests.api/test_Zones.py
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 20 Dec 2016 12:36:48 +0000 (13:36 +0100)
committer	GitHub <noreply@github.com>
	Tue, 20 Dec 2016 12:36:48 +0000 (13:36 +0100)
		1	2
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
regression-tests.api/test_Zones.py	patch \|	diff1 \|	diff2 \|	blob \| history