]> 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: 502920d 18d646d)
Merge branch 'cache-memcached'
authorGrigorii Demidov <grigorii.demidov@nic.cz>
Mon, 1 Jun 2015 10:31:51 +0000 (12:31 +0200)
committerGrigorii Demidov <grigorii.demidov@nic.cz>
Mon, 1 Jun 2015 10:31:51 +0000 (12:31 +0200)

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