Merge remote-tracking branch 'upstream/master' into demo-mano-integration
authorpeusterm <manuel.peuster@uni-paderborn.de>
Tue, 13 Jun 2017 11:41:33 +0000 (13:41 +0200)
committerpeusterm <manuel.peuster@uni-paderborn.de>
Tue, 13 Jun 2017 11:41:33 +0000 (13:41 +0200)
commit6dcec5542d668c188ffcf491a8abaac4c5735040
treeb64f629b37d11ad73b56f876962481df0f683f4d
parent42c44b48f62be3739a3c5cffa58829ef907d7d0d
parentb5e1c8935bcfbe76bdee4039d160031ba85d8016
Merge remote-tracking branch 'upstream/master' into demo-mano-integration