From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 9 Apr 2019 13:30:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: dnsdist-1.4.0-alpha1~7^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4021f4bd4895a5d3b83024751ab71e5119945fc5;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master'
---

4021f4bd4895a5d3b83024751ab71e5119945fc5