]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 16 Jan 2015 14:30:07 +0000 (15:30 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 16 Jan 2015 14:30:07 +0000 (15:30 +0100)

Trivial merge