From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 20 Dec 2016 10:46:21 +0000 (+0100)
Subject: Merge branch 'develop'
X-Git-Tag: release-1.7.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fremotes%2Forigin%2FHEAD;p=thirdparty%2Fldns.git

Merge branch 'develop'
---

470934b7d8cb16e75de4da9fc4da7ab7ddc58cd1