Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Sun, 29 Sep 2013 08:17:22 +0000 (10:17 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Sun, 29 Sep 2013 08:17:22 +0000 (10:17 +0200)
commit4ff1e9aaad338778801f0e73290705d02192f579
treee8b1ed112c985091698e9c55e8a3397d8c696ac5
parent19758d9f87b24eb4017382c43a44324e2e54a11c
parent11b150d935ebdd422e3d3edb698f2e08c45e2229
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I4e5b26b796b12ced8a62926cdf91da10b9c20f9e