]> granicus.if.org Git - pdns/commitdiff
Merge remote-tracking branch 'origin/master' into packet-too-big
authorPieter Lexis <pieter.lexis@powerdns.com>
Fri, 18 Jan 2019 10:33:31 +0000 (11:33 +0100)
committerPieter Lexis <pieter.lexis@powerdns.com>
Fri, 18 Jan 2019 10:33:31 +0000 (11:33 +0100)
1  2 
pdns/dnspacket.cc

Simple merge