Commits
Katja Marttila committed 1fe36e54d5bM
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: Ib2ab53321b599eb2e8b1e6e23be2ba507a948c5c
