]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop
authorWillem Toorop <willem@nlnetlabs.nl>
Wed, 30 Apr 2014 13:27:17 +0000 (15:27 +0200)
committerWillem Toorop <willem@nlnetlabs.nl>
Wed, 30 Apr 2014 13:27:17 +0000 (15:27 +0200)

Trivial merge