From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 21 Jan 2019 09:20:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into extra-warnings
X-Git-Tag: rec-4.2.0-alpha1~11^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7375%2Fhead;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into extra-warnings
---

4acd9501c135aaf000aa46912756b1bf1a355181