Merge pull request #415 from sibeream/master

author gthess <george@nlnetlabs.nl>

Wed, 4 Aug 2021 08:42:12 +0000 (10:42 +0200)

committer GitHub <noreply@github.com>

Wed, 4 Aug 2021 08:42:12 +0000 (10:42 +0200)
author gthess <george@nlnetlabs.nl>
Wed, 4 Aug 2021 08:42:12 +0000 (10:42 +0200)
committer GitHub <noreply@github.com>
Wed, 4 Aug 2021 08:42:12 +0000 (10:42 +0200)
diff --cc config.h.in
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
author	gthess <george@nlnetlabs.nl>
	Wed, 4 Aug 2021 08:42:12 +0000 (10:42 +0200)
committer	GitHub <noreply@github.com>
	Wed, 4 Aug 2021 08:42:12 +0000 (10:42 +0200)
		1	2
config.h.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history