Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 12:45:09 +0000 (14:45 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 12:45:09 +0000 (14:45 +0200)
commitd07aa35bc83f710e350831738235be65addd8ab7
treead8eda259a93ae666078a55016619cfc79443a29
parent593e1b99f10e261de854766d59c3d433cbe3d088
parentfca12620b1e14a5d2daf467f2f8c6eb96714e80a
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ic82ed2ba60d9855f1490d4ca66451dbc42ae6e2f
qtmultimedia.pro