Merge remote-tracking branch 'origin/5.4' into dev
authorYoann Lopes <yoann.lopes@theqtcompany.com>
Thu, 27 Nov 2014 13:44:33 +0000 (14:44 +0100)
committerYoann Lopes <yoann.lopes@theqtcompany.com>
Thu, 27 Nov 2014 13:44:49 +0000 (14:44 +0100)
commit7e3d69668e3f04110a651dee1850a1d0c885947b
treee55041237e21735e0849cb25aabf37937d6ea809
parenteddc8e1e58c0377ae392409d9afccea91ba1cd22
parent59f2bf186400241c62a02044265d9ecab81c1749
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Iaa608643f6626ed074a9fd374555cc5bc84659d5