]> 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: a6b42f7 14b34bf)
Merge branch 'master' into fix-ns-badboys
authorMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 4 Jun 2015 22:06:45 +0000 (00:06 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 4 Jun 2015 22:06:45 +0000 (00:06 +0200)

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