Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorJani Heikkinen <jani.heikkinen@digia.com>
Fri, 25 Apr 2014 07:39:01 +0000 (09:39 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 25 Apr 2014 07:39:01 +0000 (09:39 +0200)

Trivial merge