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

Change-Id: I061a46a31c7e16386a2040b4777bc797aaa635e2