]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4443cc 7da1c4a)
Merge branch 'master' into ednssubnet
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 30 Oct 2015 19:13:18 +0000 (20:13 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 30 Oct 2015 19:13:18 +0000 (20:13 +0100)

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