Merge branch 'next-version' of vcs.fsf.org:enc into next-version
authorZak Rogoff <zak@fsf.org>
Fri, 15 Jan 2016 23:32:36 +0000 (18:32 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 15 Jan 2016 23:32:36 +0000 (18:32 -0500)

Trivial merge