Merge remote-tracking branch 'origin/5.4.0' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 12:45:12 +0000 (13:45 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 12:45:12 +0000 (13:45 +0100)
commit04bcc6650f277f918a6c938ab24dc10e82d645c8
tree41f36402949f8d69df3bfe3a525cdc3e382bb7b9
parentc7155c05394649a08b494a63d22f4ba3039a7a98
parent954fa54a88cff31a7fc869a49d17474ab1da8459
Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: I9002ef6585513ebfb9e641e890f8b0e855c67a08