Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Mar 2014 15:07:34 +0000 (16:07 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Mar 2014 15:07:34 +0000 (16:07 +0100)
commit2618b6c77ddf7fd8e7a54dd80891b724c8fc035f
treef187433bd4eb509875b189a43fa8039eee42663c
parentcd7882b760ae34034b1b5b53c6e7970eb05f2bc2
parent4aeda4943e9532719c49f02a5997f74fe4e0e7c9
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I310b468e9ba5b1e70f2e792df746a93ecb067c1a