]> granicus.if.org Git - pdns/commitdiff
Merge branch 'dnsname' of github.com:ahupowerdns/pdns into dnsname
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 31 Mar 2015 14:03:28 +0000 (16:03 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 31 Mar 2015 14:03:28 +0000 (16:03 +0200)

Trivial merge