From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 12 Dec 2016 11:59:11 +0000 (+0100)
Subject: Merge !93: fixup the previous merge
X-Git-Tag: v1.2.0-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=940fda9a1807f511446f5b3a5dc69873d781e89c;p=thirdparty%2Fknot-resolver.git

Merge !93: fixup the previous merge
---

940fda9a1807f511446f5b3a5dc69873d781e89c