Merge pull request #8290 from pieterlexis/arg-parser-improvement

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Wed, 18 Sep 2019 16:45:42 +0000 (18:45 +0200)

committer GitHub <noreply@github.com>

Wed, 18 Sep 2019 16:45:42 +0000 (18:45 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Wed, 18 Sep 2019 16:45:42 +0000 (18:45 +0200)
committer GitHub <noreply@github.com>
Wed, 18 Sep 2019 16:45:42 +0000 (18:45 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/receiver.cc
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Wed, 18 Sep 2019 16:45:42 +0000 (18:45 +0200)
committer	GitHub <noreply@github.com>
	Wed, 18 Sep 2019 16:45:42 +0000 (18:45 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/receiver.cc	patch \|	diff1 \|	diff2 \|	blob \| history