Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 18 Feb 2014 09:02:27 +0000 (10:02 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 18 Feb 2014 09:02:27 +0000 (10:02 +0100)

Trivial merge