From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 5 Apr 2017 09:44:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 1.2
X-Git-Tag: v1.2.5~5^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=966c842d412d00e7d323eac0110a2dc60b7fa240;p=thirdparty%2Fknot-resolver.git

Merge remote-tracking branch 'origin/master' into 1.2
---

966c842d412d00e7d323eac0110a2dc60b7fa240