]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Tue, 7 May 2013 10:16:05 +0000 (12:16 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Tue, 7 May 2013 10:16:05 +0000 (12:16 +0200)

Trivial merge