Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:41:43 +0000 (18:41 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:41:43 +0000 (18:41 +0100)
commitcc0eb9c2aa9032c6a7bf2ab05d1eb913a09fa4f1
tree7314014389e227bd7c9b28d97eebcd072e4852a2
parentcb2ac154273a8c07a1e4a14246ae22f6e0deaeda
parent0a74dc69b4c57a15da90be29b598371dfa63f7ee
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/qml/jsruntime/qv4managed_p.h

Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f