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

Merge branch '1.2.0-rc2' into 'master'

Release second release candidate of 1.2.0

See merge request !164
---

76b1f3471c452c4f4aa550b6b73f25cdab0ada2d