Merge branch 'master' of vcs.fsf.org:enc
authortomnor <tomasn@posteo.net>
Mon, 16 May 2016 20:32:05 +0000 (22:32 +0200)
committertomnor <tomasn@posteo.net>
Mon, 16 May 2016 20:32:05 +0000 (22:32 +0200)

Trivial merge