Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 14:22:12 +0000 (15:22 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 17 Jan 2014 14:22:12 +0000 (15:22 +0100)
Change-Id: Id265682aa7db9be1c0b305ab3207b2c932a25a9f

1  2 
src/qml/compiler/qv4regalloc.cpp

Simple merge