Merge remote-tracking branch 'origin/5.4.0' into 5.4 v5.4.1
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 11:51:49 +0000 (12:51 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Wed, 17 Dec 2014 11:51:49 +0000 (12:51 +0100)
commit2cf398f541d68f60e0205820524b79b37045bf0f
tree4e95fce3abb1e489c1ac34b18cf1b19b17d7aac2
parent015d6117f30891fe01f57c4b5d3b3a4695c41074
parentfdc7026fb7d098abbf135fd5e7d2cf00884f9235
Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: Ifa04cb59a4b0985e6261678c0d0b62438a50e91c