]> granicus.if.org Git - pdns/commitdiff
Merge remote-tracking branch 'origin/master' into dprotect
authorbert hubert <bert.hubert@powerdns.com>
Tue, 17 Nov 2015 12:37:01 +0000 (13:37 +0100)
committerbert hubert <bert.hubert@powerdns.com>
Tue, 17 Nov 2015 12:37:01 +0000 (13:37 +0100)
1  2 
pdns/Makefile.am
pdns/dnsrecords.hh

Simple merge
Simple merge