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

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

87c2ba1a69baf360fc6a2e4506b38a05cbea1d9b