]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Sun, 7 Dec 2014 20:31:06 +0000 (21:31 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Sun, 7 Dec 2014 20:31:06 +0000 (21:31 +0100)

Trivial merge