From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 3 Jan 2019 12:27:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into fix-weird-trying-error
X-Git-Tag: rec-4.2.0-alpha1~67^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7308%2Fhead;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into fix-weird-trying-error
---

3219d4ca792d2e5769ded63601640df5ab2c2fe0