From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 27 Mar 2017 12:23:09 +0000 (+0200)
Subject: Merge branch 'master' and update deckard
X-Git-Tag: v1.2.5~6^2~2^2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adccbea50b95aad86d97d40506e9b6c019777ceb;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' and update deckard

We need this to fix the tests.
---

adccbea50b95aad86d97d40506e9b6c019777ceb
diff --cc tests/deckard
index b96ef5cd5,5b47a6b1a..b985a91d0
--- a/tests/deckard
+++ b/tests/deckard
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit b96ef5cd589ddb71eefb89e09fee1087a49edf35
 -Subproject commit 5b47a6b1adb2bad6eedec8a07dacbe6b673aa28d
++Subproject commit b985a91d0e5f2f30d430d3fb4823f20f78661c70