Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 15 Aug 2013 18:56:56 +0000 (20:56 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 15 Aug 2013 18:56:56 +0000 (20:56 +0200)
commit42a4a0df5880f217ecb0e1e748c5233a569bf4c7
tree4fa928054fa9a58bc3b565ca0166262f60941416
parent463524fac8942c5b81b6cccb6050d2b3db4ee0fa
parent7ec1d9797b1a9c058945fad20a6c8d3171f89555
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I3953f2473e3b2cf9768286fef1c5efd08c61c6f0