Merge branch 'master' of https://git.maemo.org/projects/qtmeetings
authoritkonma <marko.itkonen@ixonos.com>
Tue, 26 May 2009 11:52:25 +0000 (14:52 +0300)
committeritkonma <marko.itkonen@ixonos.com>
Tue, 26 May 2009 11:52:25 +0000 (14:52 +0300)
Conflicts:
src/BusinessLogic/Engine.cpp


No differences found