]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 23 Dec 2015 10:06:17 +0000 (11:06 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 23 Dec 2015 10:06:17 +0000 (11:06 +0100)

Trivial merge