Merge branch 'master' of https://git.maemo.org/projects/drnoksnes
authorJavier S. Pedro <maemo@javispedro.com>
Sat, 3 Apr 2010 15:56:19 +0000 (17:56 +0200)
committerJavier S. Pedro <maemo@javispedro.com>
Sat, 3 Apr 2010 15:56:19 +0000 (17:56 +0200)
commit6b862697b65da26c7c2c1fcbbe335760356c2d58
tree83e72c46dbe720ab1ec7bf162294267b32bf0eb6
parent8f1b9d611fba8c049fdb48a2c1372c054f519215
parent8faf2ee612d1bee93b7f9f8e095470e55abec4da
Merge branch 'master' of https://git.maemo.org/projects/drnoksnes

Conflicts:

gui/i18n/pl.po
gui/i18n/sv.po
gui/i18n/pl.po