Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 16:02:49 +0000 (17:02 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 16:02:49 +0000 (17:02 +0100)
commita6285b0447553732e25aecfcdfee727291ba2637
tree9bbed2bc08d0222ee35d38d9998f6952c7d16b8c
parentc3618f6cdab6acdf745295d2ffa2755eabef72e7
parent49b020db22028b3f4de96769d42fcc98ffb3f4e6
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I028af77ed75b91c721ec3e20eccca49e30fbd495