from my feature branch
Merge branch 'myfeature' into dev
Bumped version number to 1.0
Merge branch 'release-1.0'
the first hotfix
the second hotfix
Merge branch 'hotfit-1.0'