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

Merge branch 'release-1.7.x'
---

b1344fce4fd4f85bad1c92446f037c32c5f2f5e2