Merge remote-tracking branch 'origin/master' into dprotect

author bert hubert <bert.hubert@powerdns.com>

Tue, 17 Nov 2015 12:16:36 +0000 (13:16 +0100)

committer bert hubert <bert.hubert@powerdns.com>

Tue, 17 Nov 2015 12:16:36 +0000 (13:16 +0100)
author bert hubert <bert.hubert@powerdns.com>
Tue, 17 Nov 2015 12:16:36 +0000 (13:16 +0100)
committer bert hubert <bert.hubert@powerdns.com>
Tue, 17 Nov 2015 12:16:36 +0000 (13:16 +0100)
diff --cc pdns/Makefile.am
Simple merge
diff --cc pdns/dnsparser.hh
Simple merge
diff --cc pdns/dnsrecords.hh
Simple merge
author	bert hubert <bert.hubert@powerdns.com>
	Tue, 17 Nov 2015 12:16:36 +0000 (13:16 +0100)
committer	bert hubert <bert.hubert@powerdns.com>
	Tue, 17 Nov 2015 12:16:36 +0000 (13:16 +0100)
		1	2
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsparser.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsrecords.hh	patch \|	diff1 \|	diff2 \|	blob \| history