From: Charles-Henri Bruyand <2854905+chbruyand@users.noreply.github.com>
Date: Mon, 7 Jan 2019 12:31:43 +0000 (+0100)
Subject: Merge branch 'master' into static-cppcheck
X-Git-Tag: rec-4.2.0-alpha1~49^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7289%2Fhead;p=thirdparty%2Fpdns.git

Merge branch 'master' into static-cppcheck
---

9f57e2143c1d21aa3d17bafcd0cb51c5f7cca9bc