Added by Nikos Skalkotos about 10 years ago
Merge branch 'hotfix-0.4.4' into develop
Conflicts: image_creator/os_type/unix.py image_creator/version.py version