Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Tue, 8 Oct 2013 08:14:22 +0000 (10:14 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Tue, 8 Oct 2013 08:14:38 +0000 (10:14 +0200)
commit9c1470888d8fa1dc3220ea411b8429bf8e9df688
treeb99c8711ef3148c357c4b2b79f37cfd8e4181d64
parent4ff1e9aaad338778801f0e73290705d02192f579
parent3c63cedb5d3defd831eb2d8bfdeb883121737ef3
Merge branch 'stable' into dev

Change-Id: Icbade3b8a1098b442dccb04c85c597e9c7adc423