Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Sat, 11 Sep 2021 14:50:42 +0000 (17:50 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 11 Sep 2021 14:50:42 +0000 (17:50 +0300)

Trivial merge