Commits
Oswald Buddenhagen committed 51afc1eb8ebM
Merge remote-tracking branch 'origin/1.6' 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: I32a2a17b8fd7dc0f1f9c12272fc5f814ea5d86cb
