]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into auth-ringbugs
authorPieter Lexis <pieter.lexis@powerdns.com>
Thu, 21 Feb 2019 11:17:17 +0000 (12:17 +0100)
committerPieter Lexis <pieter.lexis@powerdns.com>
Thu, 21 Feb 2019 11:17:17 +0000 (12:17 +0100)
1  2 
pdns/speedtest.cc

Simple merge