From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Wed, 20 May 2015 13:33:48 +0000 (+0200)
Subject: Merge branch 'prefer-ipv6-nsrep'
X-Git-Tag: v1.0.0-beta1~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e68c0088a252325b25d75096f4f434c04857c968;p=thirdparty%2Fknot-resolver.git

Merge branch 'prefer-ipv6-nsrep'
---

e68c0088a252325b25d75096f4f434c04857c968