From: Ondřej Surý <ondrej.sury@nic.cz>
Date: Wed, 5 Apr 2017 10:12:43 +0000 (+0200)
Subject: Merge branch '1.2-resync' into '1.2'
X-Git-Tag: v1.2.5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b00c5c55d323848fda70675f2e5efb91100e8040;p=thirdparty%2Fknot-resolver.git

Merge branch '1.2-resync' into '1.2'

1.2 resync with master

See merge request !258
---

b00c5c55d323848fda70675f2e5efb91100e8040