Merge branch 'master' of https://vcs.maemo.org/git/situare
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 24 Jun 2010 06:53:43 +0000 (09:53 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 24 Jun 2010 06:53:43 +0000 (09:53 +0300)
commit7f9360154f2b0cb48dd5ae5f9d79a347d8492169
treea3f3c329d23b79ebc26dc084bfff08bd0d51b5e0
parent0030c3b81fecacab17b5283094db6afe6feb6766
parent75461a0f20b38ca5c475fa48dcb8067406c9ae66
Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
res/languages/situare_fi.qm
res/languages/situare_fi.ts
res/languages/situare_fi.qm
res/languages/situare_fi.ts
src/engine/engine.cpp
src/ui/userinfo.cpp