]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 10 Dec 2014 08:25:27 +0000 (09:25 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 10 Dec 2014 08:25:27 +0000 (09:25 +0100)

Trivial merge