Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Mar 2014 15:07:12 +0000 (16:07 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Mar 2014 15:07:13 +0000 (16:07 +0100)
commit33480a083aa5cb2a3e5203fccf23238ac0644e34
treeb830b3021a10a7f9a0639fe1f46a97fbdb4824f6
parent0e1279ccdffa9d704a6e1ae4d0bf626841b434dc
parent3d7f132db4f91eccce1987c2860834a0b88d392d
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I11df18cceb1decbd0bf723f9911a5f985eb7d59f