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

Merge branch '1.2' into 'master'

Sync 1.2 branch to master

See merge request !268
---

b67801061acbd5fc1dbdc6ebc272fcb261bd108a