tree a419f28123a27116182ab8157460c213807bfe16
parent 96c6b9884278e54db1fc267aecb3f11594e0d55e
parent ee9c4f73ebe04b4c335cf3408c173ef7317676d2
author Akron <nils@diewald-online.de> 1466159527 +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"