From: lenieto3 <lenieco@gmail.com>
Date: Tue, 24 Jun 2014 18:39:03 +0000 (-0500)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=89759f0782e329744f516aa7be4e327257a3d1dc;p=enc-live.git

Merge branch 'master' of vcs.fsf.org:enc

defenza -> defensa
---

89759f0782e329744f516aa7be4e327257a3d1dc