From: Juan Jose Olivera <juan@genso.com.bo>
Date: Tue, 24 Jun 2014 18:41:52 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9ce98c82a9fec21fb8f493b20feeead97f943826;p=enc-live.git

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

9ce98c82a9fec21fb8f493b20feeead97f943826