Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:05:27 +0000 (16:05 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 3 Apr 2013 14:05:27 +0000 (16:05 +0200)
commitb76e699246385fe467b7635508396e8f76bac93e
tree13b25384a6e5a1107280104ac8b3357951ce9203
parentb8169e058a10e44abacd3dd6f3a4432bfdf151e8
parentde06fb45694171f5c914d8a61b17f6068b44a6c2
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I5b71788a8d02b27d99841768d7fcbc2aa8e81766