From: Juan Jose Olivera <juan@genso.com.bo>
Date: Mon, 7 Jul 2014 13:08:57 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4cf32d13013ffcecec52f8993d303e8c9be32d10;p=enc-live.git

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

4cf32d13013ffcecec52f8993d303e8c9be32d10