Merge branch 'master' of https://vcs.fsf.org/git/enc
authorzoe1 <zoe@fsf.org>
Fri, 30 Jul 2021 00:14:28 +0000 (02:14 +0200)
committerzoe1 <zoe@fsf.org>
Fri, 30 Jul 2021 00:14:28 +0000 (02:14 +0200)

Trivial merge