Merge commit '61045141d11e5e7b392ee0c6f57a6c0e1424be4d'

author Paul Hänsch <paul@plutz.net>

Thu, 24 Mar 2022 11:48:14 +0000 (12:48 +0100)

committer Paul Hänsch <paul@plutz.net>

Thu, 24 Mar 2022 11:48:14 +0000 (12:48 +0100)
author Paul Hänsch <paul@plutz.net>
Thu, 24 Mar 2022 11:48:14 +0000 (12:48 +0100)
committer Paul Hänsch <paul@plutz.net>
Thu, 24 Mar 2022 11:48:14 +0000 (12:48 +0100)
diff --cc cgilite/cgilite.sh
Simple merge
diff --cc cgilite/markdown.awk
Simple merge
author	Paul Hänsch <paul@plutz.net>
	Thu, 24 Mar 2022 11:48:14 +0000 (12:48 +0100)
committer	Paul Hänsch <paul@plutz.net>
	Thu, 24 Mar 2022 11:48:14 +0000 (12:48 +0100)
		1	2
cgilite/cgilite.sh	patch \|	diff1 \|	diff2 \|	blob \| history
cgilite/markdown.awk	patch \|	diff1 \|	diff2 \|	blob \| history