Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Feb 2014 15:43:10 +0000 (16:43 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 12 Feb 2014 15:43:10 +0000 (16:43 +0100)

Trivial merge