Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 28 Jun 2013 17:18:39 +0000 (19:18 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 28 Jun 2013 17:18:54 +0000 (19:18 +0200)
commitc1832b78d484ab76afc7baf494c556c7dba32677
tree62e2ad5e05301c76b7bbda1dd31042f1a338e63e
parentffe861a0785056a90c787172400fa6061acfcc32
parent811337a73c160447e5218ae55e93df99ac3d9edd
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I140852ef7fbbfe303dac620af5e6eba5ee3a4b02