Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 19 Aug 2015 18:45:51 +0000 (14:45 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 19 Aug 2015 18:45:51 +0000 (14:45 -0400)

Trivial merge