]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 2 Jan 2015 09:54:24 +0000 (10:54 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 2 Jan 2015 09:54:24 +0000 (10:54 +0100)

Trivial merge