From: Willem Toorop Date: Tue, 11 Nov 2014 15:24:42 +0000 (+0100) Subject: Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop X-Git-Tag: release-1.7.0-rc1~130 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b5c4fc20a2fdc57e7af7c7d4ccde94c3e964b2a;p=thirdparty%2Fldns.git Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop --- 1b5c4fc20a2fdc57e7af7c7d4ccde94c3e964b2a