From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Thu, 30 Aug 2018 07:50:15 +0000 (+0200)
Subject: Merge pull request #6898 from ploxiln/changelog_414_fix
X-Git-Tag: dnsdist-1.3.3~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d9a63a27c61f145ff8aa5aeeb14e94d5ec8504e;p=thirdparty%2Fpdns.git

Merge pull request #6898 from ploxiln/changelog_414_fix

changelog: 4.1.4 back-ported #6648 not #6848
---

2d9a63a27c61f145ff8aa5aeeb14e94d5ec8504e