]> granicus.if.org Git - pdns/commit
Merge branch 'master' of github.com:PowerDNS/pdns into jsonzone2sql
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 23 Apr 2014 05:49:18 +0000 (07:49 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 23 Apr 2014 05:49:18 +0000 (07:49 +0200)
commit673ab60a527ba2462830fae3fb664f584b0e11ef
tree05ce994b860e4df85d1d293cea7f697c5e76d4c6
parenta2e9e5a5891f74ce4f15fa79395085915f449340
parent8d1c1c2668c7402f07d6c48cfcf5ce31a90d5600
Merge branch 'master' of github.com:PowerDNS/pdns into jsonzone2sql