Merge branch 'master' of vcs.fsf.org:enc
authorVictorhck <victorhck@mailbox.org>
Thu, 7 Jun 2018 16:24:49 +0000 (18:24 +0200)
committerVictorhck <victorhck@mailbox.org>
Thu, 7 Jun 2018 16:24:49 +0000 (18:24 +0200)

Trivial merge