]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'set-adbit-when-secure' into better-rtt-tracking
authorMarek Vavrusa <marek@vavrusa.com>
Thu, 10 Mar 2016 17:29:09 +0000 (17:29 +0000)
committerMarek Vavrusa <marek@vavrusa.com>
Thu, 10 Mar 2016 17:29:09 +0000 (17:29 +0000)

Trivial merge