Merge branch 'master' of vcs.fsf.org:enc-static
authorZak Rogoff <zak@fsf.org>
Thu, 10 Jul 2014 20:39:12 +0000 (16:39 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 10 Jul 2014 20:39:12 +0000 (16:39 -0400)

Trivial merge