From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 5 Apr 2017 11:05:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 1.2
X-Git-Tag: v1.2.5~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e98a0445469e97160dfa3e6f5931bd533b26660a;p=thirdparty%2Fknot-resolver.git

Merge remote-tracking branch 'origin/master' into 1.2
---

e98a0445469e97160dfa3e6f5931bd533b26660a