Merge remote-tracking branch 'main/master' into rpz

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

Sun, 25 Oct 2015 21:02:53 +0000 (22:02 +0100)

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

Sun, 25 Oct 2015 21:02:53 +0000 (22:02 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Sun, 25 Oct 2015 21:02:53 +0000 (22:02 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Sun, 25 Oct 2015 21:02:53 +0000 (22:02 +0100)
diff --cc pdns/dnsparser.cc
Simple merge
diff --cc pdns/dnsparser.hh
Simple merge
diff --cc pdns/dnssecinfra.hh
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/reczones.cc
Simple merge
diff --cc pdns/resolver.cc
Simple merge
diff --cc pdns/syncres.cc
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Sun, 25 Oct 2015 21:02:53 +0000 (22:02 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Sun, 25 Oct 2015 21:02:53 +0000 (22:02 +0100)
		1	2
pdns/dnsparser.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsparser.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnssecinfra.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/reczones.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/resolver.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.cc	patch \|	diff1 \|	diff2 \|	blob \| history