Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 16:14:48 +0000 (17:14 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 6 Jan 2014 18:15:55 +0000 (19:15 +0100)

Trivial merge