]> 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: 136ff11 96b37b6)
Merge branch 'events'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 29 Apr 2015 14:25:41 +0000 (16:25 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Wed, 29 Apr 2015 14:25:41 +0000 (16:25 +0200)

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