]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Mon, 13 Jun 2016 10:19:47 +0000 (12:19 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Mon, 13 Jun 2016 10:19:47 +0000 (12:19 +0200)

Trivial merge