tree a419f28123a27116182ab8157460c213807bfe16
parent 40d1f686941b5def306eb56239822463978b34a0
parent 2becb87856949bdcf31afaac391a59018f58defc
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"