Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 18 Sep 2013 19:50:01 +0000 (21:50 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 18 Sep 2013 19:50:01 +0000 (21:50 +0200)
commit5599d85de9e69a8fdfc63da8307816438acca167
tree0d4939a3ad6d3b743bf62e8bbbbde07a5afc0ddd
parent92e7bca3b352c577d211810d04f943160b0529d8
parent1ebfb744fedf0f9168290da05932079adcc2c536
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I8f0a0ffd5e83828d3d0910ece4ec0485c85f2d14