Merge branch 'master' into v2.1

author Mike Pall <mike>

Sun, 7 Aug 2022 18:04:52 +0000 (20:04 +0200)

committer Mike Pall <mike>

Sun, 7 Aug 2022 18:04:52 +0000 (20:04 +0200)
author Mike Pall <mike>
Sun, 7 Aug 2022 18:04:52 +0000 (20:04 +0200)
committer Mike Pall <mike>
Sun, 7 Aug 2022 18:04:52 +0000 (20:04 +0200)
diff --cc src/lib_package.c
Simple merge
diff --cc src/lj_clib.c
Simple merge
		1	2
src/lib_package.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lj_clib.c	patch \|	diff1 \|	diff2 \|	blob \| history