]> granicus.if.org Git - pdns/commitdiff
Merge branch 'dnsname' of github.com:ahupowerdns/pdns into dnsname
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 10 Apr 2015 18:21:46 +0000 (20:21 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 10 Apr 2015 18:21:46 +0000 (20:21 +0200)

Trivial merge