Merge remote-tracking branch 'origin/release' into stable
authorJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:45:21 +0000 (12:45 +0300)
committerJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:45:21 +0000 (12:45 +0300)
commit7a88dd8c976219ece1f001b2dfc02ee493ae24c9
tree61de16df7cb6115fcd193a52e71fc57a88b80920
parent78cff36ba8e195c8183c3434498bc7fddeb5c00c
parent4c8284de46052970de001c5c9b96c4fa365f89b4
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ieb521fb1e9f297a167eea19c771cb5915c01df97