Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Jun 2013 13:09:48 +0000 (15:09 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 24 Jun 2013 13:09:48 +0000 (15:09 +0200)

Trivial merge