Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:36:25 +0000 (09:36 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:37:19 +0000 (09:37 +0100)
commit2a7b4962a141939eb6efb63fc5834cb7a00141a6
treef57ae992c4044a3a3667be9d1bb39c084af088d3
parent9a1e3164f977acc2aa1b8ae182c2000d2ecbe7fc
parent2d54a14ac130812965d89237c8ede479cc2e2df6
Merge branch 'stable' into release

Change-Id: Ifa5ddfd7ee4a637f78947fc1cb945d3008506973