From: Ondřej Surý <ondrej.sury@nic.cz>
Date: Fri, 10 Feb 2017 12:28:19 +0000 (+0100)
Subject: Merge branch 'release-1.2.2' into '1.2'
X-Git-Tag: v1.2.2^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7abd7ef141a6b779ae564c8dbea8bbbdda6b331;p=thirdparty%2Fknot-resolver.git

Merge branch 'release-1.2.2' into '1.2'

Release 1.2.2

See merge request !199
---

a7abd7ef141a6b779ae564c8dbea8bbbdda6b331