From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Tue, 30 Jun 2015 22:34:17 +0000 (+0200)
Subject: Merge branch 'hive-wip'
X-Git-Tag: v1.0.0-beta1~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbd0245775a397be4677bb63ad41ff5ae23b80d2;p=thirdparty%2Fknot-resolver.git

Merge branch 'hive-wip'
---

bbd0245775a397be4677bb63ad41ff5ae23b80d2