From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Fri, 29 May 2015 16:25:50 +0000 (+0200)
Subject: Merge branch 'cache-api-noglobal' into cache-memcached-wip
X-Git-Tag: v1.0.0-beta1~125^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad5c1256a7fe8353fb50c5b5e4e5cb93bae86c32;p=thirdparty%2Fknot-resolver.git

Merge branch 'cache-api-noglobal' into cache-memcached-wip
---

ad5c1256a7fe8353fb50c5b5e4e5cb93bae86c32