Merge 5.4 into 5.4.1 v5.4.1
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Fri, 16 Jan 2015 17:05:00 +0000 (18:05 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Fri, 16 Jan 2015 17:05:00 +0000 (18:05 +0100)
commite8efb8f55d9ef0f1cfbbf6c50a71a3aada017f78
treec2b07c643f0c35236b1a9724bf5cf83e4b52afdf
parent1f2bed2bc8ce2c865b79c4948fba100b748c8bcb
parentd6c61e16437b5c31b73ada65471532625ae19ecc
Merge 5.4 into 5.4.1

Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a