From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 4 Jan 2019 11:02:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into setbufsize
X-Git-Tag: rec-4.2.0-alpha1~65^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7311%2Fhead;p=thirdparty%2Fpdns.git

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

3ca12516aa23c0d8fdb0f01bd424cd6cbd7474bf