Merge pull request #29816 from bluca/rel

author Luca Boccassi <bluca@debian.org>

Wed, 1 Nov 2023 20:14:11 +0000 (20:14 +0000)

committer GitHub <noreply@github.com>

Wed, 1 Nov 2023 20:14:11 +0000 (20:14 +0000)
author Luca Boccassi <bluca@debian.org>
Wed, 1 Nov 2023 20:14:11 +0000 (20:14 +0000)
committer GitHub <noreply@github.com>
Wed, 1 Nov 2023 20:14:11 +0000 (20:14 +0000)
diff --cc NEWS
Simple merge
diff --cc meson.build
Simple merge
author	Luca Boccassi <bluca@debian.org>
	Wed, 1 Nov 2023 20:14:11 +0000 (20:14 +0000)
committer	GitHub <noreply@github.com>
	Wed, 1 Nov 2023 20:14:11 +0000 (20:14 +0000)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history