Merge branch 'master' of vcs.fsf.org:enc
authorlenieto3 <lenieco@gmail.com>
Tue, 24 Jun 2014 18:39:03 +0000 (13:39 -0500)
committerlenieto3 <lenieco@gmail.com>
Tue, 24 Jun 2014 18:39:03 +0000 (13:39 -0500)
commit89759f0782e329744f516aa7be4e327257a3d1dc
tree3555ba75c64471c279adaf570e679c8e9cf252a4
parent0ffc05a4e528b975426aa87ec4144180bcd40e9c
parent1b061ebb1c877e438f65b56d53bca8fb612df929
Merge branch 'master' of vcs.fsf.org:enc

defenza -> defensa
es/confirmation.html
es/index.html