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

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

adf2dcb0c5d65cecce0d775a4e5d5b91b0489f9f