Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:32:51 +0000 (14:32 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:32:51 +0000 (14:32 +0200)
Change-Id: I2cba36426d8af40f94712f7f05f4e0dd4efce6e7


Trivial merge