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

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

78d8089328a0c0c3c430dd338c92127bcb210f9b