]> granicus.if.org Git - pdns/commit
Merge branch 'master' into dprotect
authorbert hubert <bert.hubert@powerdns.com>
Mon, 9 Nov 2015 10:28:20 +0000 (11:28 +0100)
committerbert hubert <bert.hubert@powerdns.com>
Mon, 9 Nov 2015 10:28:20 +0000 (11:28 +0100)
commitc2b55ab972853744571c6f1087821c2a7f8c87a3
tree6d11265fae11cecb259e64246571e959934e274e
parent796ab76ee487f011384e790834c18f14ddd872da
parent40cd3e09c2b26e0c25903652335a7f017fb7db74
Merge branch 'master' into dprotect

Conflicts:
pdns/dnsname.cc
pdns/dnsname.hh
pdns/dnsname.cc