Merge remote-tracking branch 'origin/5.4' into 5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 08:49:07 +0000 (09:49 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 08:49:07 +0000 (09:49 +0100)
commita49a02994a5a45cf9966a68621059b0ee9278e0f
treeb09f58d260ff40c28c225cc812a78d51cce7780e
parent1ee472207c63905ab4455e676ee3ffd3263ab2cb
parenta7f2e6bf8c1bc569c56d713894f442c7fed63264
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I5add7bbeab559b3f14207c37c6e010f953f6a286