]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into errno-review
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Wed, 26 Jun 2019 14:12:28 +0000 (16:12 +0200)
committerOtto Moerbeek <otto.moerbeek@open-xchange.com>
Wed, 26 Jun 2019 14:12:28 +0000 (16:12 +0200)
1  2 
pdns/misc.hh
pdns/pdns_recursor.cc

diff --cc pdns/misc.hh
Simple merge
Simple merge