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

Merge branch 'develop'
---

0b06196de368373365e74679b890feb6a3762d84