]> git.ipfire.org Git - thirdparty/pdns.git/commit
whitespace conflict. Merge branch 'master' into deforeach 2943/head
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 27 Nov 2015 21:25:17 +0000 (22:25 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 27 Nov 2015 21:25:17 +0000 (22:25 +0100)
commit5f264cf5151d1d1c5ebb649df39b92ae06957b26
treef0a3ffe77bc713a96dd431e38b904f864f0f4134
parent3c05acf88cb2ea06b2a9690d669386b6b6ca3209
parent354ccf4e7e4a14561a94b5b1ecf6cbab6494f98f
whitespace conflict. Merge branch 'master' into deforeach

Conflicts:
pdns/dnssecinfra.cc
pdns/dnsrecords.cc
pdns/dnssecinfra.cc
pdns/pdns_recursor.cc