]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #5304 from pieterlexis/rec-405-backports
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 18 May 2017 08:23:33 +0000 (10:23 +0200)
committerGitHub <noreply@github.com>
Thu, 18 May 2017 08:23:33 +0000 (10:23 +0200)
Recursor backports

1  2 
pdns/syncres.cc

diff --cc pdns/syncres.cc
Simple merge