Merge pull request #2972 from pieterlexis/no-more-experimental

author bert hubert <bert.hubert@netherlabs.nl>

Thu, 3 Dec 2015 14:45:25 +0000 (15:45 +0100)

committer bert hubert <bert.hubert@netherlabs.nl>

Thu, 3 Dec 2015 14:45:25 +0000 (15:45 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Thu, 3 Dec 2015 14:45:25 +0000 (15:45 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Thu, 3 Dec 2015 14:45:25 +0000 (15:45 +0100)
diff --cc pdns/packethandler.cc
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/ws-auth.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Thu, 3 Dec 2015 14:45:25 +0000 (15:45 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Thu, 3 Dec 2015 14:45:25 +0000 (15:45 +0100)
		1	2
pdns/packethandler.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/ws-auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history