Merge remote-tracking branch 'origin/release' into stable
authorJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 10:43:06 +0000 (13:43 +0300)
committerJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 10:47:32 +0000 (13:47 +0300)
commit15f5a8a284e3d69219b267ffd6bec153d60fecac
tree835308d86271d8a25169b0bafbd49d02a0d3e236
parent3f584a3a114c68081d16edb1f6c45aa1b8ea2e97
parentf81aac0ef6a736c8fe6627d42f43c0b3327323d7
Merge remote-tracking branch 'origin/release' into stable

Conflicts:
   src/src.pro

Change-Id: I2c4552f2969ea1282bc36ad890f9d996bef4162a