]> granicus.if.org Git - pdns/commitdiff
Merge pull request #5297 from mind04/backport
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 23 May 2017 12:15:19 +0000 (14:15 +0200)
committerGitHub <noreply@github.com>
Tue, 23 May 2017 12:15:19 +0000 (14:15 +0200)
Backport to stable

1  2 
pdns/common_startup.cc

Simple merge