Merge branch 'demo-mano-integration' of github.com:mpeuster/son-emu into demo-mano...
authorpeusterm <manuel.peuster@uni-paderborn.de>
Tue, 11 Jul 2017 12:18:12 +0000 (14:18 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Tue, 11 Jul 2017 12:18:12 +0000 (14:18 +0200)

Trivial merge