Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 29 Jul 2014 10:50:59 +0000 (12:50 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 29 Jul 2014 10:50:59 +0000 (12:50 +0200)
commit4a2f3b0d8fe2860b5daa160e96b5af4bed00dc94
tree5c502a915c0d03dca441061cdd457e73d850185c
parent49cde1b2c4cdc44d1efd5f2d34b58d6a4fda56c8
parentf31e186354b11995d4bd4f0ad3c070c638f47648
Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: I6091afdf3d4ab71462dc42ef29e001ccd8ca627b