]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Merge branch 'devel/openssl-1.1-dane' into develop
authorWillem Toorop <willem@nlnetlabs.nl>
Thu, 10 Nov 2016 22:38:01 +0000 (23:38 +0100)
committerWillem Toorop <willem@nlnetlabs.nl>
Thu, 10 Nov 2016 22:38:01 +0000 (23:38 +0100)

Trivial merge