Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:37 +0000 (14:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:38 +0000 (14:31 +0100)
commitf3d8b6855561feb1fc5f84b970bc6cb798de4557
treef2ae78e40a78e4f67f5d5ef1d1d15f404a62fa39
parent18dbfc2538cb88164894cbc413740c3831f93e1d
parent570f05c2d3ca05ac0955940b6b06fb2b3c015e6a
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6b92013d9fb14b11141d1a15c183776b2b3309fa