]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Merge branch 'release-1.6.17' release-1.6.17
authorWillem Toorop <willem@nlnetlabs.nl>
Fri, 10 Jan 2014 20:40:02 +0000 (21:40 +0100)
committerWillem Toorop <willem@nlnetlabs.nl>
Fri, 10 Jan 2014 20:40:02 +0000 (21:40 +0100)

Trivial merge