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

Merge branch 'release-1.2.5' into '1.2'

Knot Resolver 1.2.5

See merge request !254
---

8327f0f941e712d0d2b5162828ce2e8218311171