Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 19 Aug 2015 19:32:00 +0000 (15:32 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 19 Aug 2015 19:32:00 +0000 (15:32 -0400)
1  2 
en/index.html

diff --cc en/index.html
Simple merge