From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 6 Oct 2021 14:13:22 +0000 (+0200)
Subject: Merge branch 'ecaballero-nic-develop' into develop
X-Git-Tag: 1.8.0-rc.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15fa2eeba2cc529ef139d1f978aa6d9e4ce165f1;p=thirdparty%2Fldns.git

Merge branch 'ecaballero-nic-develop' into develop
---

15fa2eeba2cc529ef139d1f978aa6d9e4ce165f1