]> 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: 0f7567d 931d736)
Merge commit '931d736540012dd8a770650434b3d901434930e3'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 15 Jul 2015 16:20:48 +0000 (18:20 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 15 Jul 2015 16:20:48 +0000 (18:20 +0200)

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