Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 15:44:36 +0000 (16:44 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 15:44:36 +0000 (16:44 +0100)
commit2b5ea944b1d2f717dd74f6524cd0adc9077425de
tree7dafbe79b4ae8f9f78be92016e6587b9d2cc460f
parent2733c790d368c0c53e1471f6a60dbed25e797b5b
parentd9ed35f95835def9e3201719d986b56c01b160a2
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2c6a554f6033ce83379f2338fd3064ab39674215