]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Mon, 15 Dec 2014 18:15:36 +0000 (19:15 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Mon, 15 Dec 2014 18:15:36 +0000 (19:15 +0100)

Trivial merge