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)
commite5e99c0846ea5aee1b4ac793fb74f25d8c2a4289
tree7e9b2bcee72dd4af00281de0209283c39b7d7851
parent625c80fb93eac41f26c900f4d1e59e862aa8687b
parent7ae70ba1058c34741bdb79e10cb898ebed92057d
Merge branch 'master' of vcs.fsf.org:enc

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