]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 13 May 2015 09:40:38 +0000 (11:40 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 13 May 2015 09:40:38 +0000 (11:40 +0200)

Trivial merge