]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 3 Feb 2015 09:40:16 +0000 (10:40 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 3 Feb 2015 09:40:16 +0000 (10:40 +0100)

Trivial merge