]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3da09fd 881cef4)
Merge remote-tracking branch 'origin/master'
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 20 Jun 2014 09:55:27 +0000 (11:55 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 20 Jun 2014 09:55:27 +0000 (11:55 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.