Merge branch 'master_merge' into dev_puontsi
authorSimo Puonti <Simo.Puonti@ixonos.com>
Wed, 27 May 2009 07:37:46 +0000 (10:37 +0300)
committerSimo Puonti <Simo.Puonti@ixonos.com>
Wed, 27 May 2009 07:37:46 +0000 (10:37 +0300)
commit04e62b2c2bf80b887318399b81604fe5db315a5d
tree605b9fa7d1f032dcf11ebd7037aa519931f99dac
parent3192a06cfe2efb8ffa91b2668926b7d09dc38d5f
parent558cbaf123017b357d84109ab11d6c481c347410
Merge branch 'master_merge' into dev_puontsi

Conflicts:
src/Domain/Configuration/Configuration.cpp
src/Domain/Configuration/DateTimeSettings.cpp
QtMeetings.pro
src/Domain/Configuration/DateTimeSettings.cpp