]> 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: 3908d84 4b51089)
Merge branch 'dns-0x20'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 25 Jun 2015 15:59:50 +0000 (17:59 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 25 Jun 2015 15:59:50 +0000 (17:59 +0200)

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