]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 17 Jun 2015 13:01:36 +0000 (15:01 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 17 Jun 2015 13:01:36 +0000 (15:01 +0200)

Trivial merge