From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Sat, 13 Jun 2015 17:28:18 +0000 (+0200)
Subject: Merge branch 'root-hints'
X-Git-Tag: v1.0.0-beta1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc680cd1ea6cfb2e8d0e2de373bf75463966bc0b;p=thirdparty%2Fknot-resolver.git

Merge branch 'root-hints'
---

fc680cd1ea6cfb2e8d0e2de373bf75463966bc0b