]> 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: 3d1ee64 76a3487)
Merge branch 'master' of gitlab.labs.nic.cz:knot/resolver
authorMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 13 May 2015 09:54:52 +0000 (11:54 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 13 May 2015 09:54:52 +0000 (11:54 +0200)

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