Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Mon, 29 Dec 2014 15:18:07 +0000 (16:18 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 29 Dec 2014 15:18:07 +0000 (16:18 +0100)

Trivial merge