Merge branch 'master' of vcs.fsf.org:enc-static
authorZak Rogoff <zak@fsf.org>
Thu, 17 Jul 2014 18:58:50 +0000 (14:58 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 17 Jul 2014 18:58:50 +0000 (14:58 -0400)

Trivial merge