Merge branch 'master' into terencehill/italian_update
authorterencehill <piuntn@gmail.com>
Sat, 30 Apr 2011 18:39:44 +0000 (20:39 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 30 Apr 2011 18:39:44 +0000 (20:39 +0200)
1  2 
menu.dat.it.po

diff --cc menu.dat.it.po
Simple merge