Commits
Kai Koehne committed 2630ce66613M
Merge remote-tracking branch 'origin/2.0' 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: I60673fac543f1153dad3ef01e589c1f9c6d64599
