tree 756a0f19fe721542252edafc2c78044a20326776
parent f4ad808ca350635366967e2281fdc24d8b41b748
parent 72430e3ed81e0a18c518fa400fb9f39fe350bf46
author Akron <nils@diewald-online.de> 1426003630 +0100
committer Akron <nils@diewald-online.de> 1426003630 +0100

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

Conflicts:
	Readme.md

Change-Id: I84643fffc15e6536f6004e76e239b6edbf896325