Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
authorSergio Ahumada <sahumada@texla.cl>
Sun, 22 Feb 2015 22:21:39 +0000 (22:21 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Sun, 22 Feb 2015 22:21:39 +0000 (22:21 +0000)

Trivial merge