Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authorJan Lapinkataja <jan.lapinkataja@ixonos.com>
Wed, 27 May 2009 13:42:14 +0000 (16:42 +0300)
committerJan Lapinkataja <jan.lapinkataja@ixonos.com>
Wed, 27 May 2009 13:42:14 +0000 (16:42 +0300)
commita0695f697226de46323a2d19cfad4e25d3e6de14
tree55f01c5787c3860a4cc3a63e81ba785379503f16
parenta7e99ef966d7df8b9356eea72d5001809c827066
parent60b7802da53961d1998e276858bbc5e404b98a05
Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

Conflicts:
src/BusinessLogic/Engine.cpp
src/BusinessLogic/Engine.cpp