Merge remote branch 'cz/i18n'
commit7cf5b21d13c51379f83c4657e38c20e0127efb48
authorNedko Arnaudov <nedko@arnaudov.name>
Sun, 19 Dec 2010 11:29:58 +0000 (19 13:29 +0200)
committerNedko Arnaudov <nedko@arnaudov.name>
Sun, 19 Dec 2010 11:29:58 +0000 (19 13:29 +0200)
treea4f3f4cad8ad6f7ff07ae9a089860901d7729df1
parent0a0a2ff38e385234774ac3f616228931a16000fc
parent875f8496f34c03c50ebd077fe94b3f4187dda497
Merge remote branch 'cz/i18n'

Conflicts:
gui/about.c
gui/about.c