Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <zak@fsf.org>
Mon, 1 Feb 2016 16:23:37 +0000 (11:23 -0500)
committerZak Rogoff <zak@fsf.org>
Mon, 1 Feb 2016 16:23:37 +0000 (11:23 -0500)

Trivial merge