tree 2542e5ec36355e1e6c34d54e786653fde5e6c36a
parent 30c46061071bf3fac55892f619447d11aa7d3f0e
parent 32d2beee09e737b47c080d1e940375a096da5666
author margaretha <margaretha@ids-mannheim.de> 1461336424 +0200
committer margaretha <margaretha@ids-mannheim.de> 1461336479 +0200

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

Change-Id: I0304454410c7da7833aa7e5ecc1bb78486c47641