Merge branch 'master' into feature/package+vc

author Philip Kaludercic <philipk@posteo.net>

Sat, 15 Oct 2022 15:38:30 +0000 (17:38 +0200)

committer Philip Kaludercic <philipk@posteo.net>

Sat, 15 Oct 2022 15:38:30 +0000 (17:38 +0200)
author Philip Kaludercic <philipk@posteo.net>
Sat, 15 Oct 2022 15:38:30 +0000 (17:38 +0200)
committer Philip Kaludercic <philipk@posteo.net>
Sat, 15 Oct 2022 15:38:30 +0000 (17:38 +0200)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/emacs-lisp/package.el
Simple merge
diff --cc lisp/vc/vc-git.el
Simple merge
diff --cc lisp/vc/vc.el
Simple merge
author	Philip Kaludercic <philipk@posteo.net>
	Sat, 15 Oct 2022 15:38:30 +0000 (17:38 +0200)
committer	Philip Kaludercic <philipk@posteo.net>
	Sat, 15 Oct 2022 15:38:30 +0000 (17:38 +0200)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/package.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-git.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc.el	patch \|	diff1 \|	diff2 \|	blob \| history