Merge remote-tracking branch 'origin/5.4.1' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:35:51 +0000 (10:35 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:35:51 +0000 (10:35 +0100)
commit2c49b07f88b5f3eee17ccbdbf2a2e7e1dc43a4bb
treeeb1c790b74e63dedaa7d6fe09604e81745f2215a
parentdc4ed9e1cb4b2ea4b02793a24eb276dec1758ccd
parente8efb8f55d9ef0f1cfbbf6c50a71a3aada017f78
Merge remote-tracking branch 'origin/5.4.1' into 5.4

Change-Id: Ibde5671a132665726e9a16cdb98bceb9717e45f3