Merge branch 'master' of vcs.fsf.org:enc
authorquietwalker <emanuelinux@gmail.com>
Sat, 12 Jul 2014 20:15:57 +0000 (22:15 +0200)
committerquietwalker <emanuelinux@gmail.com>
Sat, 12 Jul 2014 20:15:57 +0000 (22:15 +0200)
1  2 
it/index.html
it/mac.html
it/windows.html

diff --cc it/index.html
Simple merge
diff --cc it/mac.html
Simple merge
diff --cc it/windows.html
Simple merge