]> 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: 87c97d4 c840607)
Merge branch 'lua_interpreter'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 8 Apr 2015 15:46:07 +0000 (17:46 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 8 Apr 2015 15:46:07 +0000 (17:46 +0200)

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