Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:14:35 +0000 (11:14 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:14:36 +0000 (11:14 +0200)
commitc1520e8aeb0ff56cd5f00ed454babab2d5c8234a
treed032ed62cb1d7648fcd83c21cf02322ad79e89c7
parent680c9cab916491cdc4310df5f87c946a50f606b4
parentc74b544610376c753ea0a29ff2465e2bcfe70e1d
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: If52332b72560d21069e24cd31b13f08f33e1f406