Merge branch 'master' of vcs.fsf.org:enc
authorJuan Jose Olivera <juan@genso.com.bo>
Tue, 24 Jun 2014 18:41:52 +0000 (14:41 -0400)
committerJuan Jose Olivera <juan@genso.com.bo>
Tue, 24 Jun 2014 18:41:52 +0000 (14:41 -0400)
1  2 
es/index.html

diff --cc es/index.html
Simple merge