Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 15:43:00 +0000 (16:43 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 15:43:02 +0000 (16:43 +0100)
commitaf368200c2ea17c64abae30ebcb3b08399b32861
tree32b7e78cf7d18b7ed2396a3c9b82055f97dd389a
parent023b3c86021d8463d216f76e8fd281d6eb4dcc3e
parent0bade306539069c353d4c3b5f232d1885298224c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Id90bd6d65f15785215cdac2c19bae937925afbd3