Merge branch 'master' into settings_auto_update
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 8 Jun 2010 11:30:11 +0000 (14:30 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Tue, 8 Jun 2010 11:30:11 +0000 (14:30 +0300)
commit0ebe1e891050e4ae6c345f57cf2920cb9102949e
tree3712c0ac0f51ead037e1e03a33c19a493ba44545
parent2ff8fecce2cf1a9635d9c5d6fa9aae2adebed611
parentc9adb68500729acb1b32ed42a49ae280a75955a8
Merge branch 'master' into settings_auto_update

Conflicts:
doc/testing/functionality-tests.doc
src/ui/mainwindow.cpp
src/ui/mainwindow.h
src/engine/engine.cpp
src/facebookservice/facebookauthentication.cpp
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h