Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <zak@fsf.org>
Mon, 23 Jun 2014 22:00:22 +0000 (18:00 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 23 Jun 2014 22:00:22 +0000 (18:00 -0400)

Trivial merge