From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 31 Jul 2017 13:08:01 +0000 (+0200)
Subject: Merge branch 'master' into aho-corasick
X-Git-Tag: v1.4.0~18^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f74b63e07978a11b02e5099d3cdbf21741f2940;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into aho-corasick
---

7f74b63e07978a11b02e5099d3cdbf21741f2940