tree a419f28123a27116182ab8157460c213807bfe16
parent fb94c7797e52de95af1783e94478495d9d0134e4
parent 1e1bd9f8ad79f5cbf8ec487efc35ef0644d2316d
author Akron <nils@diewald-online.de> 1466159527 +0200
committer Gerrit Code Review <gerrit2@korap.ids-mannheim.de> 1466159527 +0200

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