From: Petr Špaček <petr.spacek@nic.cz>
Date: Mon, 25 Jun 2018 12:12:33 +0000 (+0200)
Subject: Merge branch 'deckard-update' into 'master'
X-Git-Tag: v2.4.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd3a748cf0e24cb02a02f0a9b1098ce6671a3dd;p=thirdparty%2Fknot-resolver.git

Merge branch 'deckard-update' into 'master'

CI: support kresd-specific integration tests

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

cfd3a748cf0e24cb02a02f0a9b1098ce6671a3dd