Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 09:02:59 +0000 (10:02 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 09:03:20 +0000 (10:03 +0100)
commit7cc1af6542c960c17ccfef02de943a35edcbb5df
tree44f07ea0c13dfca6c237e581cd2bea614dced5c9
parent20a88228e2675b4c6ba3f2474fa6f2143032a4bb
parenta12d28c0e060ddc47e9f70b499236c5af065c205
Merge branch 'stable' into release

Change-Id: Idb96b903fb08ad6fcd8fad4ba139bab27c8554da