Commits
Katja Marttila committed 4d37184b10bM
Merge remote-tracking branch 'origin/3.0' into master Conflicts: dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri Change-Id: Ifaac76cd06737167a908baba5e554bedddd0e5ae
