Merge branch 'master' of https://vcs.fsf.org/git/enc
authorzoe1 <zoe@fsf.org>
Wed, 21 Jul 2021 16:46:55 +0000 (18:46 +0200)
committerzoe1 <zoe@fsf.org>
Wed, 21 Jul 2021 16:46:55 +0000 (18:46 +0200)

Trivial merge