]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e74034 2cb98b9)
Merge branch 'dprotect' of github.com:ahupowerdns/pdns into dprotect
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 18 Nov 2015 18:43:48 +0000 (19:43 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 18 Nov 2015 18:43:48 +0000 (19:43 +0100)
Conflicts:
pdns/dnsname.cc


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