From: Lucas Teixeira <lucas@lucasteixeira.com>
Date: Mon, 23 Jun 2014 22:59:20 +0000 (-0300)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e5e99c0846ea5aee1b4ac793fb74f25d8c2a4289;p=enc.git

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

Conflicts:
	pt-br/infographic.html
---

e5e99c0846ea5aee1b4ac793fb74f25d8c2a4289