Code verändert
Merge
Merge
Merge branch 'master' of https://github.com/huberthoegl/hsa-oss-demo
Feature X eingebaut
Merge branch 'featurex'
Merge branch 'master' of git://github.com/huberthoegl/hsa-oss-demo