]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'prefer-ipv6-nsrep'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 20 May 2015 13:33:48 +0000 (15:33 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 20 May 2015 13:33:48 +0000 (15:33 +0200)

Trivial merge