Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Oct 2013 14:15:40 +0000 (16:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Oct 2013 14:15:40 +0000 (16:15 +0200)
commit62b718af9fb8efe9dca152b8be22963ffa963f3c
tree76f201189eb5ec8f16755b0ed566564df988e90f
parent31b107298609928c0eaa2e974ade59ce9d815e2c
parent24fb923ef697d91618e15ee0c66dd5b0d0a22579
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iefc16b6899346b1d15bcf0e4394ede2eade3f933