From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Thu, 3 Jan 2019 12:00:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into loggertemplate
X-Git-Tag: rec-4.2.0-alpha1~66^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7316%2Fhead;p=thirdparty%2Fpdns.git

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

ca5e6f52baebfddafaf04f495dc2781fd2a2a4f8