]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'ns-rtt-cache'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 4 Jun 2015 22:22:39 +0000 (00:22 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Thu, 4 Jun 2015 22:22:39 +0000 (00:22 +0200)

Trivial merge