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)
commit0a05ae544693c10a30e4cfd9c1460f193f252a3f
tree603ebe744fbb1bfe5e72f06c9aa4d4727b7012b7
parent0a3f1aacd38cc447bc85032a4ae2509ae472af94
parente15a2b92b6120a119cf218ab0f0630f23bc45ba5
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia2cf3c55e57d7ac17f02965915fa6933ff2c8cce
src/multimedia/multimedia.pro