]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'ns_reputation_groundwork'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Sat, 18 Apr 2015 21:44:28 +0000 (23:44 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Sat, 18 Apr 2015 21:44:28 +0000 (23:44 +0200)

Trivial merge