Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:31:56 +0000 (18:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:31:56 +0000 (18:31 +0100)
commitec28b7a1d2e2f0f6eec3a272ff86d1de494b2181
treeed53c8327b7f5cc63dddc2f90cf9ff27bf1b3db3
parent8bc2ee48483ea67277fd141b4c007f52d88215d2
parent831c6a4ec263b0f3237db488005cdb69989cfa49
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I220517794f3427f9f1746981e8dc7256bb482285