tree a419f28123a27116182ab8157460c213807bfe16
parent d9d8098ee66c3fa65131b83486825a0cec199891
parent f9772279c8c75efb7f58b4c94433249889a38a00
author Akron <nils@diewald-online.de> 1466159528 +0200
committer Gerrit Code Review <gerrit2@korap.ids-mannheim.de> 1466159528 +0200

Merge "Merge branch 'master' of ssh://korap.ids-mannheim.de:29418/KorAP/Koral"