]> granicus.if.org Git - pdns/commitdiff
Merge pull request #5355 from rgacogne/rec40-backport-4924-1988 rec-4.0.5-rc2
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 1 Jun 2017 09:33:28 +0000 (11:33 +0200)
committerGitHub <noreply@github.com>
Thu, 1 Jun 2017 09:33:28 +0000 (11:33 +0200)
rec-4.0.x: Backport #4924 and #4988


Trivial merge