From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Mon, 22 Jun 2015 11:08:53 +0000 (+0200)
Subject: Merge branch 'block-module'
X-Git-Tag: v1.0.0-beta1~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a755818bc21db989b907ea2d4fd282eadd88081;p=thirdparty%2Fknot-resolver.git

Merge branch 'block-module'
---

5a755818bc21db989b907ea2d4fd282eadd88081