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)
Change-Id: Ic82ed2ba60d9855f1490d4ca66451dbc42ae6e2f

1  2 
qtmultimedia.pro

Simple merge