]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 6 May 2013 07:06:46 +0000 (09:06 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 6 May 2013 07:06:46 +0000 (09:06 +0200)

Trivial merge