Merge branch 'master' into fb_auth_window_removal
authorlampehe-local <henri.lampela@ixonos.com>
Wed, 12 May 2010 12:53:04 +0000 (15:53 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Wed, 12 May 2010 12:53:04 +0000 (15:53 +0300)
commit67cfbe07b1210e0330ca899412780d6cb26e9e84
treec632f04cf96756e645b18dbf2932d91f08ae5c8f
parent6aed3f4ef3e0e8e5e4c0352e9213c59fabc88b86
parent00cd5ff5ea5eb5fee9d3c05b3c3969fcc928ea4c
Merge branch 'master' into fb_auth_window_removal

Conflicts:
src/ui/mainwindow.cpp
src/ui/mainwindow.cpp