]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' into loglog2018
authorbert hubert <bert.hubert@netherlabs.nl>
Thu, 4 Oct 2018 08:25:34 +0000 (10:25 +0200)
committerGitHub <noreply@github.com>
Thu, 4 Oct 2018 08:25:34 +0000 (10:25 +0200)
1  2 
pdns/Makefile.am

Simple merge