From: Ondřej Surý <ondrej.sury@nic.cz>
Date: Tue, 24 Jan 2017 09:21:24 +0000 (+0100)
Subject: Merge branch '1.2.0-rc3' into 'master'
X-Git-Tag: v1.2.0-rc3^0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69fd6252b2aab39faaa041d6ef903ca2131097ff;p=thirdparty%2Fknot-resolver.git

Merge branch '1.2.0-rc3' into 'master'

Prepare 1.2.0-rc3 release

See merge request !171
---

69fd6252b2aab39faaa041d6ef903ca2131097ff