Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Wed, 13 Apr 2022 14:00:59 +0000 (17:00 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 13 Apr 2022 14:00:59 +0000 (17:00 +0300)

Trivial merge