Merge remote-tracking branch 'origin/stable' into dev v5.2.0-alpha1
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 18 Sep 2013 19:47:35 +0000 (21:47 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 18 Sep 2013 19:47:37 +0000 (21:47 +0200)
commit31b107298609928c0eaa2e974ade59ce9d815e2c
tree5a04806dd6d1b1ebd59a8f8912147f9eeb6f1fef
parent354404ffd224ca691b0d8a9c1c45b358b10b47bb
parent27d22c5f4201c7555b42e187252bee3fd88d3821
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I46b53c8d8aaed59e548ccb8cadb60afd00ca7aa6