Merge branch 'master' into static-cppcheck

author Charles-Henri Bruyand <2854905+chbruyand@users.noreply.github.com>

Mon, 7 Jan 2019 12:31:43 +0000 (13:31 +0100)

committer GitHub <noreply@github.com>

Mon, 7 Jan 2019 12:31:43 +0000 (13:31 +0100)
author Charles-Henri Bruyand <2854905+chbruyand@users.noreply.github.com>
Mon, 7 Jan 2019 12:31:43 +0000 (13:31 +0100)
committer GitHub <noreply@github.com>
Mon, 7 Jan 2019 12:31:43 +0000 (13:31 +0100)
diff --cc pdns/misc.cc
Simple merge
diff --cc pdns/pdnsutil.cc
Simple merge
diff --cc pdns/rcpgenerator.cc
Simple merge
diff --cc pdns/syncres.hh
Simple merge
diff --cc pdns/zoneparser-tng.cc
Simple merge
author	Charles-Henri Bruyand <2854905+chbruyand@users.noreply.github.com>
	Mon, 7 Jan 2019 12:31:43 +0000 (13:31 +0100)
committer	GitHub <noreply@github.com>
	Mon, 7 Jan 2019 12:31:43 +0000 (13:31 +0100)
		1	2
pdns/misc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdnsutil.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rcpgenerator.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/zoneparser-tng.cc	patch \|	diff1 \|	diff2 \|	blob \| history