Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 27 Aug 2013 20:45:25 +0000 (22:45 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 27 Aug 2013 20:45:26 +0000 (22:45 +0200)
commit949a3243c1be5000217687e0eb7645162e1dbb30
treed2b427564112af0dd674cf3f28b914e0864fd80f
parent5a55be4101a0250ec9c189cc16d4705d881753a3
parentfcac33167b4194b91d3741c26593338fe5801af4
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I98df818f6411c38a6ad8a8efaf6b6a0203dbb958