Merge branch 'master' into master_merge
[qtmeetings] / QtMeetings.conf
2009-05-27 Simo Puontiadded the conf file changes
2009-05-19 Ossi Jormakkaqtmeetings sources to Maemo garage