Merge pull request #1465 from zeha/update-yahttp

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

Tue, 24 Jun 2014 12:19:30 +0000 (14:19 +0200)

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

Tue, 24 Jun 2014 12:19:30 +0000 (14:19 +0200)
author Peter van Dijk <peter@7bits.nl>
Tue, 24 Jun 2014 12:19:30 +0000 (14:19 +0200)
committer Peter van Dijk <peter@7bits.nl>
Tue, 24 Jun 2014 12:19:30 +0000 (14:19 +0200)
diff --cc pdns/ws-auth.cc
Simple merge
diff --cc pdns/ws-recursor.cc
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Tue, 24 Jun 2014 12:19:30 +0000 (14:19 +0200)
committer	Peter van Dijk <peter@7bits.nl>
	Tue, 24 Jun 2014 12:19:30 +0000 (14:19 +0200)
		1	2
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history