Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:12:48 +0000 (09:12 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:14:25 +0000 (09:14 +0100)
commit31d7f4b4e631d08cbb7160027d849057abbd41f2
treeb5db5ba340f5d4645883620eb37751806a20bb23
parent0fb1f56d0a453853349b71383e6a00f3f0190117
parente5cd35c807029d3955c03707874f76b773b445bc
Merge branch 'stable' into release

Change-Id: If66343daf53d9a5fc6eebd67b1c5dcfd7d219f55