From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 2 Oct 2018 07:14:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into pdns-builder
X-Git-Tag: dnsdist-1.3.3~83^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6246%2Fhead;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into pdns-builder
---

db51728ab35b59bedebaab1e67a4d2c74054cf4d