Merge branch 'master' into master_merge
authorSimo Puonti <Simo.Puonti@ixonos.com>
Thu, 28 May 2009 05:49:58 +0000 (08:49 +0300)
committerSimo Puonti <Simo.Puonti@ixonos.com>
Thu, 28 May 2009 05:49:58 +0000 (08:49 +0300)
commitd2f9c56c10ad3300b87ca1529beb96ae28c02c42
treec0ea94b8d8b41d50582f49ea9d21904c09c8fdb1
parent558cbaf123017b357d84109ab11d6c481c347410
parentbd153701307613c96e7bdf070cf32b0cbc6ae834
Merge branch 'master' into master_merge
QtMeetings.pro