]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Merge branch 'release-1.6.17' into develop
authorWillem Toorop <willem@nlnetlabs.nl>
Wed, 8 Jan 2014 14:35:49 +0000 (15:35 +0100)
committerWillem Toorop <willem@nlnetlabs.nl>
Wed, 8 Jan 2014 14:35:49 +0000 (15:35 +0100)

Trivial merge