Merge branch 'master' of https://vcs.fsf.org/git/enc
authorzoe1 <zoe@fsf.org>
Tue, 20 Jul 2021 15:23:59 +0000 (17:23 +0200)
committerzoe1 <zoe@fsf.org>
Tue, 20 Jul 2021 15:23:59 +0000 (17:23 +0200)

Trivial merge