Merge branch 'hotfix/20130829-2321' into develop
Merge branch 'develop' of github.com:dkemper/dummy into develop
feature branch
Merge branch 'myfeature' into develop
Bumped version number to 1.0
commited all
Merge branch 'release/release-1.0'