Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 21:28:29 +0000 (21:28 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 10 Feb 2015 21:28:29 +0000 (21:28 +0000)

Trivial merge