]> 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: e4868c3 271dc09)
Merge branch 'master' into deckard
authorMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 19 Nov 2015 17:46:18 +0000 (18:46 +0100)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 19 Nov 2015 17:46:18 +0000 (18:46 +0100)

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