]> granicus.if.org Git - pdns/commitdiff
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)

Trivial merge