Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:11:11 +0000 (18:11 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:11:11 +0000 (18:11 +0100)
commit023b3c86021d8463d216f76e8fd281d6eb4dcc3e
treeb0b612b2b7fe560c2787c03cd091446a34ed257f
parentf9db3acbf1f05f34339bd7e46a67a1b1f605c46a
parentc640a496d63036ead177dd006ef56b9b12d962bb
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iba1fab2097ca750924b169017e2c7d2825b066c6