From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Tue, 11 Aug 2015 15:33:12 +0000 (+0200)
Subject: Merge branch 'policy'
X-Git-Tag: v1.0.0-beta1~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4df2bf6ddda9ae886b936b6d66c1bef9c687ef2;p=thirdparty%2Fknot-resolver.git

Merge branch 'policy'
---

e4df2bf6ddda9ae886b936b6d66c1bef9c687ef2