From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 1 Oct 2018 06:48:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into alias-servfail-on-nxd
X-Git-Tag: dnsdist-1.3.3~69^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6727%2Fhead;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into alias-servfail-on-nxd
---

9da798b28700bda9d582e86bef70ed9d3250c955