From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Fri, 14 Jul 2017 11:14:41 +0000 (+0200)
Subject: Merge branch 'master' into hints-name-order
X-Git-Tag: v1.3.2~5^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7b07e35c92aa30404d3933948bc2f93069e1e51;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into hints-name-order

(so that NEWS can get updated)
---

e7b07e35c92aa30404d3933948bc2f93069e1e51