From: Ondřej Surý <ondrej.sury@nic.cz>
Date: Wed, 8 Mar 2017 12:39:34 +0000 (+0100)
Subject: Merge branch 'cherry-pick-2ff4eb98' into '1.2'
X-Git-Tag: v1.2.4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0246609cef552ff07255586f6126bdb94b7c579;p=thirdparty%2Fknot-resolver.git

Merge branch 'cherry-pick-2ff4eb98' into '1.2'

Merge branch 'fix-auth-qname' into '1.2'

See merge request !230
---

d0246609cef552ff07255586f6126bdb94b7c579