]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns into test/541-723
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 17 May 2013 14:13:39 +0000 (16:13 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 17 May 2013 14:13:39 +0000 (16:13 +0200)

Trivial merge