Commits

Tim Jenssen committed 1ee847c0dd5M
Merge remote-tracking branch 'origin/1.3' Conflicts: src/libs/installer/lib7z_facade.h Change-Id: I045ca5e4a2a76e5e651bbedc613f086bd60d563d
Merge remote-tracking branch 'origin/1.3' Conflicts: src/libs/installer/lib7z_facade.h Change-Id: I045ca5e4a2a76e5e651bbedc613f086bd60d563d