Merge pull request #1782 from zeha/api-key

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

Mon, 13 Oct 2014 08:19:54 +0000 (10:19 +0200)

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

Mon, 13 Oct 2014 08:19:54 +0000 (10:19 +0200)
author Peter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 13 Oct 2014 08:19:54 +0000 (10:19 +0200)
committer Peter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 13 Oct 2014 08:19:54 +0000 (10:19 +0200)
diff --cc pdns/docs/pdns.xml
Simple merge
diff --cc pdns/webserver.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@netherlabs.nl>
	Mon, 13 Oct 2014 08:19:54 +0000 (10:19 +0200)
committer	Peter van Dijk <peter.van.dijk@netherlabs.nl>
	Mon, 13 Oct 2014 08:19:54 +0000 (10:19 +0200)
		1	2
pdns/docs/pdns.xml	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/webserver.cc	patch \|	diff1 \|	diff2 \|	blob \| history