Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Thu, 27 Jan 2022 10:57:16 +0000 (12:57 +0200)
committerEli Zaretskii <eliz@gnu.org>
Thu, 27 Jan 2022 10:57:16 +0000 (12:57 +0200)

Trivial merge