]> git.ipfire.org Git - thirdparty/ldns.git/commitdiff
Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop
authorMatthijs Mekking <matthijs@nlnetlabs.nl>
Wed, 18 Jun 2014 07:58:28 +0000 (09:58 +0200)
committerMatthijs Mekking <matthijs@nlnetlabs.nl>
Wed, 18 Jun 2014 07:58:28 +0000 (09:58 +0200)

Trivial merge