From: Remi Gacogne <rgacogne@users.noreply.github.com>
Date: Thu, 21 Feb 2019 12:00:44 +0000 (+0100)
Subject: Merge branch 'master' into master
X-Git-Tag: auth-4.2.0-beta1~9^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7406%2Fhead;p=thirdparty%2Fpdns.git

Merge branch 'master' into master
---

20fd10088dc336a57b75153e4092c0a31924779f