Merge branch 'master' of vcs.fsf.org:enc
authorLucas Teixeira <lucas@lucasteixeira.com>
Mon, 23 Jun 2014 22:59:20 +0000 (19:59 -0300)
committerLucas Teixeira <lucas@lucasteixeira.com>
Mon, 23 Jun 2014 22:59:20 +0000 (19:59 -0300)
Conflicts:
pt-br/infographic.html

1  2 
pt-br/infographic.html

Simple merge