]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into rec-dnstap
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 8 Mar 2019 08:45:56 +0000 (09:45 +0100)
committerOtto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 8 Mar 2019 08:45:56 +0000 (09:45 +0100)
1  2 
pdns/pdns_recursor.cc

Simple merge