Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 14:36:55 +0000 (15:36 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 16 Dec 2013 14:36:56 +0000 (15:36 +0100)
commit967e0eb22f8e85db185d093b95da57e3ec41e7cc
treefda0a86c20dfde5681a07df5a0b2a71f7438818c
parent75e5708832ce31a7edd4f4c1eb15f5b5f3d72c14
parentecce937a054e4a96597cb13c40d216bddbd45891
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I4fea8b03bc8baaa97e95413f05d13f0f505705d3