Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 12 Aug 2013 10:51:49 +0000 (12:51 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 12 Aug 2013 11:29:27 +0000 (13:29 +0200)

Trivial merge