]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' into dprotect
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 27 Nov 2015 08:52:37 +0000 (09:52 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 27 Nov 2015 08:52:37 +0000 (09:52 +0100)
1  2 
pdns/Makefile.am
pdns/dnsname.cc

Simple merge
diff --cc pdns/dnsname.cc
Simple merge