From: Ondřej Surý <ondrej.sury@nic.cz>
Date: Thu, 9 Mar 2017 12:55:25 +0000 (+0100)
Subject: Merge branch 'release-1.2.4' into '1.2'
X-Git-Tag: v1.2.4^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d18e3cc72d43afa960cb90fee59dab57c6757f66;p=thirdparty%2Fknot-resolver.git

Merge branch 'release-1.2.4' into '1.2'

Knot Resolver 1.2.4

See merge request !231
---

d18e3cc72d43afa960cb90fee59dab57c6757f66