Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 13 Sep 2013 14:43:11 +0000 (16:43 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 13 Sep 2013 14:43:11 +0000 (16:43 +0200)
commit92e7bca3b352c577d211810d04f943160b0529d8
tree6be3cba824a74d84f37ad7df1f48cf954a0ffe7e
parent0c8a003c6f2affee5a3f6b73b9e96d178b06cd75
parent4d5b5c275835120eba080d47335c10daa12ab69f
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia3604754fdb32b0e358a635b0bb16d4fa312bf2d