Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:27:14 +0000 (14:27 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:27:14 +0000 (14:27 +0100)
commit46bb36f983fc503d36b5ff9d31677153d4aa8086
treeef3977d0bdb11777e5e1be9e18fb803c9b2ab5aa
parent969dc839c3b0028e821d15015f99bd70d76fbc03
parentf7ada9b9325c7adc10da6a3a4e7f887452682260
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I324152dc6eec44e4f5524ff87b136f0ae20635c0