From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 30 Jan 2018 13:05:58 +0000 (+0100)
Subject: Merge branch 'master' into cache-aggr-wip
X-Git-Tag: v2.0.0~6^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa3ba9f6bb87d302c509264862faa9cf61873442;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into cache-aggr-wip
---

fa3ba9f6bb87d302c509264862faa9cf61873442