From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 26 Jul 2017 10:18:57 +0000 (+0200)
Subject: Merge branch 'master' into predict-fix
X-Git-Tag: v1.3.2~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0a7dd39b4c180964b7e98317230efda83aa638e;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into predict-fix

... to allow NEWS update
---

f0a7dd39b4c180964b7e98317230efda83aa638e