From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 3 Feb 2020 08:36:31 +0000 (+0100)
Subject: Merge branch 'master' into rec-prep-rec-4.3.0-rc1
X-Git-Tag: auth-4.3.0-beta2~48^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb2898300ecae0e10a19cb9673b6134a4d6b9bb4;p=thirdparty%2Fpdns.git

Merge branch 'master' into rec-prep-rec-4.3.0-rc1
---

bb2898300ecae0e10a19cb9673b6134a4d6b9bb4