Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:22:48 +0000 (09:22 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:22:49 +0000 (09:22 +0100)
commitcac65e7a222b848a735a974b0aeb43209b0cfa18
treef7f3c5d4ec0c8377ca96bef94263d42330fa17e8
parent60f27761e2a0a32d148643a8884071970c911b3e
parentb5a49a260d03249c386f1b63c249089383dd81fa
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib9047acb4fadba2a72bbb56c9b5a49ad0e7df64e