Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 15:12:44 +0000 (16:12 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Fri, 21 Nov 2014 15:12:44 +0000 (16:12 +0100)
commiteddc8e1e58c0377ae392409d9afccea91ba1cd22
tree652a9c8229ce8b5137093e2ee82e2a83c6975b91
parentc3f5a15f24f4421e0a096b2272273d9a85f70851
parent2020b032e83d1b61736a80a6815635aa7451deed
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Id87e56ccfc9f33f98c3d06991f6fe9c14d38fbac