Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorTony Sarajärvi <tony.sarajarvi@digia.com>
Thu, 24 Apr 2014 08:38:56 +0000 (10:38 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 24 Apr 2014 08:38:56 +0000 (10:38 +0200)

Trivial merge