Merge "Merge branch 'release' into stable" into refs/staging/stable
authorGunnar Sletta <gunnar.sletta@digia.com>
Thu, 17 Jan 2013 21:48:20 +0000 (22:48 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 17 Jan 2013 21:48:20 +0000 (22:48 +0100)
commit0d17d4a19c07e475920dcb0d0c57a8717ba98844
treeda0ae041721a986d1119bb5f0f73f8c9a6f3cdf1
parent21c1cfb8674c0af9f52ef57c4fbd47f0bc78546f
parent36a42ed6b11dce102d0e0f93fbd441011b003157
Merge "Merge branch 'release' into stable" into refs/staging/stable