From: Jan Lapinkataja Date: Wed, 27 May 2009 13:42:14 +0000 (+0300) Subject: Merge branch 'master' of https://git.maemo.org/projects/qtmeetings X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=a0695f697226de46323a2d19cfad4e25d3e6de14;p=qtmeetings Merge branch 'master' of https://git.maemo.org/projects/qtmeetings Conflicts: src/BusinessLogic/Engine.cpp --- a0695f697226de46323a2d19cfad4e25d3e6de14