Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 10:56:41 +0000 (12:56 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 10:56:41 +0000 (12:56 +0200)
commit5d84f3afee8707950ec7c5cc842dc932bbcaeffa
tree2aeb34bcd0b86dfd1113fef2e95c0dbb4bf38334
parent96adb952c82fd70c29f0c3665f5d111003b54ed9
parent9e64bb707883e9ec6aa18b95a151520e43803d60
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I14edee594efc9368a491d00f8e04d14652b58cf7