]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 6 Jan 2015 14:25:32 +0000 (15:25 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 6 Jan 2015 14:25:32 +0000 (15:25 +0100)

Trivial merge