Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:54:29 +0000 (10:54 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 26 Nov 2013 09:54:29 +0000 (10:54 +0100)
commit8cc5a741d016d49952d4eb15dac57cc34c1e2344
treed6ff2fe2b9cc6ebfac160ae761f2c21fa78c1677
parent678c21eeae541463f90737d341c532334d9f5b71
parent15bb30b0e90c628cc3812627923d1d459d461505
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I473774c5e7a62c2aa8541d22327366364ad70553