Commits
Kai Koehne committed 711c579ffa0M
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: Ia5dd8dfbaa2289f1b167191d6997a5f4340721a2
