tree a419f28123a27116182ab8157460c213807bfe16
parent f9772279c8c75efb7f58b4c94433249889a38a00
parent fb94c7797e52de95af1783e94478495d9d0134e4
author Akron <nils@diewald-online.de> 1466155333 +0200
committer Akron <nils@diewald-online.de> 1466155333 +0200

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