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

Merge branch '1.2.4-dev' into '1.2'

1.2.4 dev

See merge request !227
---

433294193a16e3e0102fac8d562a6708b8e726f2