]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
projects / thirdparty / knot-resolver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 977d496 4930d1d)
Merge branch 'iter_score_ns' into test_ns_lameness
authorMarek Vavruša <marek.vavrusa@nic.cz>
Sun, 15 Feb 2015 22:25:45 +0000 (23:25 +0100)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Sun, 15 Feb 2015 22:25:45 +0000 (23:25 +0100)

Trivial merge
Mirror of https://gitlab.nic.cz/knot/knot-resolver.git