]> granicus.if.org Git - pdns/commit
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 24 Apr 2015 08:16:21 +0000 (10:16 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 24 Apr 2015 08:16:21 +0000 (10:16 +0200)
commit285f206dc2afe54197b1283c4e9fca01092b0568
treebd943663cf461d94e031d8168749b6027b05e662
parent8e14b23c14391e7f037229e96e6c3020b7af3e98
parentd8c0cd8f1a998c4775fdaf34050149acacab65d6
Merge branch 'master' of github.com:PowerDNS/pdns

Conflicts:
docs/secpoll.zone