Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorSergio Ahumada <sergio.ahumada@digia.com>
Tue, 13 Aug 2013 22:18:19 +0000 (00:18 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 13 Aug 2013 22:18:19 +0000 (00:18 +0200)

Trivial merge