From: Thiago Marinello <marinello@acm.org>
Date: Mon, 23 Jun 2014 23:17:29 +0000 (-0300)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9a0c55514f4f91be5ea047965856eb6a11594839;p=enc-live.git

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

9a0c55514f4f91be5ea047965856eb6a11594839