]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 015db42 da0c97a)
Merge branch 'master' into rel/auth-3.3
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Thu, 30 May 2013 13:59:21 +0000 (15:59 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Thu, 30 May 2013 13:59:21 +0000 (15:59 +0200)

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