From: Matthijs Mekking Date: Wed, 18 Jun 2014 07:58:28 +0000 (+0200) Subject: Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop X-Git-Tag: release-1.7.0-rc1~161 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=986ffe55a408aab5517dd716353dcd5e266aa7fb;p=thirdparty%2Fldns.git Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop --- 986ffe55a408aab5517dd716353dcd5e266aa7fb