]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop
authorW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Mon, 20 Jan 2014 15:24:38 +0000 (16:24 +0100)
committerW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Mon, 20 Jan 2014 15:24:38 +0000 (16:24 +0100)

Trivial merge