Commits

Kai Koehne committed 1be5082af80M
Merge remote-tracking branch 'origin/2.0' Conflicts: src/libs/installer/packagemanagercore.cpp Change-Id: Ie3d94fe3a633e189c260bf20682c00a2bb901bc8
Merge remote-tracking branch 'origin/2.0' Conflicts: src/libs/installer/packagemanagercore.cpp Change-Id: Ie3d94fe3a633e189c260bf20682c00a2bb901bc8