Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 9 Aug 2013 20:39:27 +0000 (22:39 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 9 Aug 2013 20:39:27 +0000 (22:39 +0200)
commit90d59cb8ca0428ef048aa17d0e9d92acc0424ee8
treec25bf46d85bdde277619931f10d12335f1163832
parentbcaa8575352ad16e1f6020436e1a3f450eefd53e
parente0de3b7205efb3d99d38f19d1ee3e7e49ae5045c
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ida20e2ebeb6316e2c6916570ce2e166951af9ee2