Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:51:52 +0000 (21:51 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 19:51:52 +0000 (21:51 +0200)
commit5301551198f15b7393a41aa3585323b7e42a0b1b
treeabb45f281b0fb78dd6ef3ef9060670b1bd0cea6e
parenta77201b597b908097e6abc763d8ec275cf99774f
parentd714c0576cc9fa30537c390003203d79c8ab46d8
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I23fb0ae0d08e0cdcda7d17c70cb19f1e499e1475