]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop
authorWillem Toorop <willem@nlnetlabs.nl>
Tue, 11 Nov 2014 15:24:42 +0000 (16:24 +0100)
committerWillem Toorop <willem@nlnetlabs.nl>
Tue, 11 Nov 2014 15:24:42 +0000 (16:24 +0100)

Trivial merge