]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Mon, 7 Apr 2014 17:27:31 +0000 (19:27 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Mon, 7 Apr 2014 17:27:31 +0000 (19:27 +0200)

Trivial merge