From: Willem Toorop Date: Wed, 30 Apr 2014 13:27:17 +0000 (+0200) Subject: Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop X-Git-Tag: release-1.7.0-rc1~161^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9beb2052ffeaaf3a1f7bb83fe3cbef2aa42e5505;p=thirdparty%2Fldns.git Merge branch 'develop' of gitlab.nlnetlabs.nl:ldns into develop --- 9beb2052ffeaaf3a1f7bb83fe3cbef2aa42e5505