Merge remote-tracking branch 'origin/5.5' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:14:50 +0000 (18:14 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:14:50 +0000 (18:14 +0100)
commit97a28ee354ff60cf1a7cc90be441bb4a02971998
tree7ad80366d66c2ebf7e45912ed62e55fe551ef84c
parentc7e80fc10fe3a3e6624920972ccda40f1d89852c
parent735d1fec355b012a1051a45f6a7f6a1ae43f96c5
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Id1f9650707d821fe98e5f92ec77bc42cb96e32ed