From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 23 Feb 2018 11:35:27 +0000 (+0100)
Subject: Merge branch 'release-2-1-1' into 'master'
X-Git-Tag: v2.1.1^0
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e0fe4b4a38fb370a4f0736689b6cc67d5a6e1c2f;p=thirdparty%2Fknot-resolver.git

Merge branch 'release-2-1-1' into 'master'

release 2.1.1

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

e0fe4b4a38fb370a4f0736689b6cc67d5a6e1c2f