Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 12 Aug 2015 19:20:02 +0000 (15:20 -0400)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 12 Aug 2015 19:20:02 +0000 (15:20 -0400)

Trivial merge