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

Trivial merge