tree 10d41c8fe3e57bc0ce9dd14c3339f1ad1f46a95b
parent b571b3647fcb4afa8270d08bbe26b273e2ffa32e
parent 3fc0fd4a40ec912f421acb2a957c3327b8e9daeb
author Bodmo <Bodmer@ids-mannheim.de> 1493821363 +0200
committer Bodmo <Bodmer@ids-mannheim.de> 1493821363 +0200

Merge branch 'master' of ssh://korap.ids-mannheim.de:29418/private/Kustvakt-core