]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48e8132 5b43204)
Merge branch 'master' into rel/auth-3.3
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Tue, 28 May 2013 12:56:35 +0000 (14:56 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Tue, 28 May 2013 12:56:35 +0000 (14:56 +0200)

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