]> granicus.if.org Git - pdns/commit
Merge branch 'master' into botan-2
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Fri, 27 Oct 2017 14:03:28 +0000 (16:03 +0200)
committerGitHub <noreply@github.com>
Fri, 27 Oct 2017 14:03:28 +0000 (16:03 +0200)
commita3acbaddf0557a9460136f3bdcad23ba08df8822
treeb1b0443a6bf06700e3e2f850a3045c0d134080ac
parenta15333cdbbe7f7c925a5eeb885a2e645fe644729
parent70870f7600766e955ae1718fa59963c3dce9d3e6
Merge branch 'master' into botan-2
pdns/Makefile.am
pdns/recursordist/Makefile.am