From: Ana Isabel Carvalho <ana.isabelc@gmail.com>
Date: Tue, 17 Jun 2014 18:29:43 +0000 (+0100)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f68717a014ee3a5b00fdb5491b39e229d5735958;p=enc-live.git

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

f68717a014ee3a5b00fdb5491b39e229d5735958