Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 18 Feb 2013 15:08:56 +0000 (16:08 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 18 Feb 2013 15:08:56 +0000 (16:08 +0100)
commitdb4289240d1f031a218871bb78a2da59e58f7244
treed46acc163c5943b599d4fe782dc28843365e9cef
parentb87ed762241f6415c20338ccf896ab9beb3d7cea
parent5717e881ae7246e3ab2e1df12af73378ebaad824
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7fab4ce7041dc8b7dc93d09d2c026be23975d58d