Merge branch 'master' of https://git.maemo.org/projects/drnoksnes
authorJavier S. Pedro <maemo@javispedro.com>
Sun, 31 Jan 2010 23:41:26 +0000 (00:41 +0100)
committerJavier S. Pedro <maemo@javispedro.com>
Sun, 31 Jan 2010 23:41:26 +0000 (00:41 +0100)
commite3f1998895a5caa3262215a72201c3ea2533b74b
tree7dc1fb0409887e71d30cd5ab6829d84be56461ee
parent346d0cc83e6586a8802e24b61577b83c02a88719
parent67b3b6d4accdaebfcc5898cf72de51166d1f704f
Merge branch 'master' of https://git.maemo.org/projects/drnoksnes

Conflicts:

gui/i18n/drnoksnes_plugin.pot
gui/i18n/sv.po