]> granicus.if.org Git - pdns/commit
Merge branch 'rpz' of github.com:ahupowerdns/pdns into rpz
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 23 Oct 2015 10:54:09 +0000 (12:54 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 23 Oct 2015 10:54:09 +0000 (12:54 +0200)
commit326d39924fb3324aa407cf2c8291a0c9036a7837
tree7d31f99c6ba60c3058d9a7cfc55e67e0f2d4a83d
parent7cc1c3505f5b4cec17bf2c5ab99dccad41819bbc
parentafae4a71733c2b5333f2b54acace6ffeef64dd4b
Merge branch 'rpz' of github.com:ahupowerdns/pdns into rpz

Conflicts:
pdns/ixplore.cc
pdns/ixplore.cc