tree c6232e77f1b9b3de2c4e79dff17bedbdd59db5e6
parent ee9c4f73ebe04b4c335cf3408c173ef7317676d2
parent 0186e980520e834137b0a0764f5e22380906d9a0
author Akron <nils@diewald-online.de> 1466072836 +0200
committer Akron <nils@diewald-online.de> 1466072836 +0200

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