Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Tue, 2 Apr 2013 14:51:16 +0000 (16:51 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Tue, 2 Apr 2013 14:51:40 +0000 (16:51 +0200)
commitf85e3bbf659de4f6bbcaff6ec360453f96b7dea0
treeb7e4178d0eadff94af0556e4cb71ae96cf5f5374
parent313d60c107d9659efd5e93ba5a036054f6b1ebba
parenta2cd7f79031ed14b98420ede645376fe71182a1c
Merge branch 'stable' into dev

Change-Id: I4890e881fd9c9b7309168157279faec2011a212f