Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Fri, 27 May 2022 06:42:39 +0000 (09:42 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 27 May 2022 06:42:39 +0000 (09:42 +0300)

Trivial merge