Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <zak@fsf.org>
Wed, 18 Jun 2014 20:52:31 +0000 (16:52 -0400)
committerZak Rogoff <zak@fsf.org>
Wed, 18 Jun 2014 20:52:31 +0000 (16:52 -0400)

Trivial merge