Merge branch 'master' of vcs.fsf.org:enc
authorAdam Leibson <adaml@fsf.org>
Wed, 12 Aug 2015 15:15:45 +0000 (11:15 -0400)
committerAdam Leibson <adaml@fsf.org>
Wed, 12 Aug 2015 15:15:45 +0000 (11:15 -0400)
1  2 
en/index.html

diff --cc en/index.html
Simple merge