Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:30 +0000 (14:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:30 +0000 (14:31 +0100)
commita08fd84854c3249983f76ea3994e49e0374254ae
treed7a8f9d16d089827aceb3dc5020a23023ec13d31
parent8b725e3f41e244c9f3d65a701c7242369fd88e11
parentc216d3ced546dd160005912c90694a07b4626942
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iaa0684017736c6a5ec387a201add89fc351adfe2