From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Thu, 17 Sep 2015 11:58:51 +0000 (+0200)
Subject: Merge branch 'master' into cache-rrsig-wip
X-Git-Tag: v1.0.0-beta1~53^2~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03393afbfeb644544f0ad5f76abd52079abe7988;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' into cache-rrsig-wip
---

03393afbfeb644544f0ad5f76abd52079abe7988