Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 12:44:16 +0000 (14:44 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Jun 2013 12:44:37 +0000 (14:44 +0200)
commitcac497e7a45fc901798663006ac7894b7197a549
treef79fb413d3adfd2fa181ba672832bb342c38a607
parente99cb6767b54aa9b082c4fd8bef93760c563da59
parent5ce41d1e77db3f46c396834f698826f4fd998344
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie916db2bc4973016541176363d08c5dd14ff6b69