Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Fri, 20 Jun 2014 20:24:13 +0000 (16:24 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Fri, 20 Jun 2014 20:24:13 +0000 (16:24 -0400)

Trivial merge