Merge branch 'master' of vcs.fsf.org:enc
authorThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 23:17:29 +0000 (20:17 -0300)
committerThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 23:17:29 +0000 (20:17 -0300)
1  2 
pt-br/mac.html
pt-br/windows.html

diff --cc pt-br/mac.html
Simple merge
Simple merge