From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 26 Jul 2019 14:49:40 +0000 (-0400)
Subject: Merge branch 'develop'
X-Git-Tag: release-1.8.4-rc1~40^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc967e93cedf2bf587b14efce5a7b094aa559920;p=thirdparty%2Fldns.git

Merge branch 'develop'
---

cc967e93cedf2bf587b14efce5a7b094aa559920