Merge branch 'master' of...

Merge branch 'master' of git.rwth-aachen.de:monticore/EmbeddedMontiArc/languages/CNNArchLang into timmermanns
1 job for timmermanns in 5 minutes and 53 seconds (queued for 2 seconds)