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

Merge branch '1.2-merge-master' into 'master'

1.2 merge master

Closes #158, #160, and #151

See merge request !257
---

d9215faec59739bc03e35f435b06d18015a27ee3