Merge remote-tracking branch 'origin/release' into stable v5.3.1
authorJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:45:09 +0000 (12:45 +0300)
committerJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:45:09 +0000 (12:45 +0300)
commit039a3564cfba72cd4ebb1007e5b732800dbfeccb
tree8b6450880d15f0fa94edec0f758a42f74f959182
parent2fae3a15717bd141974ef97e4a8299bb534aa90a
parentddbbc1f08c9e267b8d4a447e20034ba53b1a53d0
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I56a541591b5be2ab5672735d5fe4e26b98c3d77c