Merge branch 'modality'
commite1262ead5495ecc7902b61ac3e1f3da22294bb2d
authorSven Strickroth <email@cs-ware.de>
Tue, 17 May 2016 19:40:11 +0000 (17 21:40 +0200)
committerSven Strickroth <email@cs-ware.de>
Tue, 17 May 2016 19:40:30 +0000 (17 21:40 +0200)
tree164c6237e9247eafd280f99e24321263ba4ac34f
parent174eda0526745c2d20baf52ce7a8b485468bca80
parent199c9de9a971ce2ddd9e382813108cc6f1bc2d04
Merge branch 'modality'

Signed-off-by: Sven Strickroth <email@cs-ware.de>