From: Marek VavruĊĦa Date: Thu, 4 Jun 2015 22:06:45 +0000 (+0200) Subject: Merge branch 'master' into fix-ns-badboys X-Git-Tag: v1.0.0-beta1~125^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=482bca02ad75b803bcb63b6b91bdfc606711aa9a;p=thirdparty%2Fknot-resolver.git Merge branch 'master' into fix-ns-badboys --- 482bca02ad75b803bcb63b6b91bdfc606711aa9a