]> granicus.if.org Git - pdns/commit
Merge branch 'master' into ednssubnet
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 10 Nov 2015 07:52:04 +0000 (08:52 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 10 Nov 2015 07:52:04 +0000 (08:52 +0100)
commitdc8b92c01919069f32eaa82a50cb69d5d4f36fe6
tree2351c6c3fd0d64132cd3fdd560ecbfdc489b2075
parent86f3ca51b1792d418076c8f58cdfbd391c61a964
parent391b7fbeaa45060afb3c4b78d12c4a4b50dd3fab
Merge branch 'master' into ednssubnet

Conflicts:
pdns/dnsname.hh
pdns/Makefile.am