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

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

190e20cd5d91a80f5a2014f94ada5aa3a738186f