From: Ana Isabel Carvalho <ana.isabelc@gmail.com>
Date: Wed, 4 Jun 2014 19:27:59 +0000 (+0100)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f15db7820f3e5788862030bdcf34db82ec563e58;p=enc-live.git

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

f15db7820f3e5788862030bdcf34db82ec563e58