Merge remote-tracking branch 'origin/5.4.1' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:35:36 +0000 (10:35 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:35:36 +0000 (10:35 +0100)
commitacf13ece3d41c7a7188b6e44d17106dfefafa3d8
treee236975992f8ca65cc30e881598beeef5c706174
parent43ba79acb9ca4080b950c3273f2e237593c80172
parentbc0cbee60cc309bef5e5359254f798942f676928
Merge remote-tracking branch 'origin/5.4.1' into 5.4

Change-Id: I854c8bff922c0ffcaf2ea6daec00c12e9bed540e