Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:58:47 +0000 (18:58 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 27 Jan 2014 17:58:47 +0000 (18:58 +0100)
commitbffb1cc117e08fb7571836698a5b688d0f4f5de9
tree2dcc2a98eafcc58abd47793d5e2e1fca1daef7d9
parent7451906b71e7271238ecf9446b7960ab2c647cc9
parentd19bede8adf9d9219ade62a873d294b6b5f76fe5
Merge remote-tracking branch 'origin/release' into stable

Change-Id: If97b68b56071e241c659ddd231f28e433954d7be