Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:26:39 +0000 (23:26 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 11 Jul 2013 21:26:39 +0000 (23:26 +0200)
Change-Id: Ia2cf3c55e57d7ac17f02965915fa6933ff2c8cce

1  2 
src/multimedia/multimedia.pro

Simple merge