Merge pull request #17454 from keszybz/journal-dlopen-cleanup

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Wed, 28 Oct 2020 17:20:27 +0000 (18:20 +0100)

committer GitHub <noreply@github.com>

Wed, 28 Oct 2020 17:20:27 +0000 (18:20 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 28 Oct 2020 17:20:27 +0000 (18:20 +0100)
committer GitHub <noreply@github.com>
Wed, 28 Oct 2020 17:20:27 +0000 (18:20 +0100)
diff --cc meson.build
Simple merge
diff --cc src/test/meson.build
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 28 Oct 2020 17:20:27 +0000 (18:20 +0100)
committer	GitHub <noreply@github.com>
	Wed, 28 Oct 2020 17:20:27 +0000 (18:20 +0100)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history