Commits

Katja Marttila committed b4144d80976M
Merge remote-tracking branch 'origin/2.0' Conflicts: doc/installerfw.qdoc Change-Id: I3d991775eae96c7de689e4b92393065564940a5f
Merge remote-tracking branch 'origin/2.0' Conflicts: doc/installerfw.qdoc Change-Id: I3d991775eae96c7de689e4b92393065564940a5f