From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Wed, 13 May 2015 09:54:52 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.labs.nic.cz:knot/resolver
X-Git-Tag: v1.0.0-beta1~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4b51e3df99b4f83718b6693e73f6d2105df21c7;p=thirdparty%2Fknot-resolver.git

Merge branch 'master' of gitlab.labs.nic.cz:knot/resolver
---

c4b51e3df99b4f83718b6693e73f6d2105df21c7