]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'remove-infinite-test-loops' of github.com:cmouse/pdns into cmouse-remov...
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Tue, 18 Jun 2013 09:11:02 +0000 (11:11 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Tue, 18 Jun 2013 09:11:02 +0000 (11:11 +0200)

Trivial merge