]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
projects / thirdparty / ldns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b06196 5e56f7c)
Merge branch 'develop' origin/HEAD origin/master release-1.7.0
authorWillem Toorop <willem@nlnetlabs.nl>
Tue, 20 Dec 2016 10:46:21 +0000 (11:46 +0100)
committerWillem Toorop <willem@nlnetlabs.nl>
Tue, 20 Dec 2016 10:46:21 +0000 (11:46 +0100)

Trivial merge
Mirror of https://github.com/NLnetLabs/ldns.git