Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 13 Aug 2013 19:00:22 +0000 (21:00 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 13 Aug 2013 19:00:22 +0000 (21:00 +0200)

Trivial merge