From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Thu, 25 Jun 2015 15:59:50 +0000 (+0200)
Subject: Merge branch 'dns-0x20'
X-Git-Tag: v1.0.0-beta1~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79ae1a32ceebaaf8b2458e9034114f49b9cdfdf8;p=thirdparty%2Fknot-resolver.git

Merge branch 'dns-0x20'
---

79ae1a32ceebaaf8b2458e9034114f49b9cdfdf8