Merge branch 'master' of vcs.fsf.org:enc
authorLisa Marie Maginnis <lisam@fsf.org>
Mon, 30 Jun 2014 14:51:35 +0000 (10:51 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Mon, 30 Jun 2014 14:51:35 +0000 (10:51 -0400)

Trivial merge