From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 10 Apr 2019 08:10:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into rec-edsn-unaligned-test
X-Git-Tag: dnsdist-1.4.0-alpha1~7^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7698%2Fhead;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into rec-edsn-unaligned-test
---

e0d1d61b4c0d6ee100a6b0cc4b09810615b84524