Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorIikka Eklund <iikka.eklund@digia.com>
Tue, 27 May 2014 07:24:14 +0000 (09:24 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 27 May 2014 07:24:14 +0000 (09:24 +0200)

Trivial merge