Merge branch 'userinfo'
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 26 May 2010 12:10:54 +0000 (15:10 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Wed, 26 May 2010 12:10:54 +0000 (15:10 +0300)
Conflicts:
doc/test_cases/functionality-tests.doc

1  2 
doc/test_cases/functionality-tests.doc
src/ui/mainwindow.cpp

index 99b595b,38c06f8..9c1643d
Binary files differ
Simple merge