From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 2 Aug 2018 12:56:24 +0000 (+0000)
Subject: Merge branch 'master-2.4.1' into 'master'
X-Git-Tag: v3.0.0~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c084dbc3bad0a1cd9a7ab8f7212a8550495defd;p=thirdparty%2Fknot-resolver.git

Merge branch 'master-2.4.1' into 'master'

update NEWS, version and deckard

See merge request knot/knot-resolver!637
---

8c084dbc3bad0a1cd9a7ab8f7212a8550495defd