tree c0b86c4a88d48c274da318f0794656a75ee7cd69
parent 12aea4da4a224418c97031853172a9dd2cbb4d2a
parent 2f83b6bc86562d57a845df0420eb24be66ed0be6
author Michael Hanl <hanl@ids-mannheim.de> 1466256774 +0200
committer Michael Hanl <hanl@ids-mannheim.de> 1466256774 +0200

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