]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into webserver-logging
authorPieter Lexis <pieter.lexis@powerdns.com>
Fri, 25 Jan 2019 17:52:33 +0000 (18:52 +0100)
committerPieter Lexis <pieter.lexis@powerdns.com>
Fri, 25 Jan 2019 17:52:33 +0000 (18:52 +0100)
1  2 
configure.ac
pdns/Makefile.am
pdns/pdns_recursor.cc

diff --cc configure.ac
Simple merge
Simple merge
Simple merge