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

Merge remote-tracking branch 'origin/master' into rec-lower-udp-trunc
---

2bdb702b9906b855872036b1349a567e73fc0940