From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 4 Apr 2017 14:31:09 +0000 (+0200)
Subject: Merge branch 'master' into 1.2
X-Git-Tag: v1.2.5~6^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81de354513fa98b3491ab4039acfc43a7195c026;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into 1.2
---

81de354513fa98b3491ab4039acfc43a7195c026