tree 6e3fc9536f905cf1fa921da6230d38d2ffb2424d
parent 505f48ccc5192d4fd67a80913ccf88a1ea904ec9
parent abb63d036681a6254a11d10b9ec793e0291f042f
author Michael Hanl <hanl@ids-mannheim.de> 1435338402 +0200
committer Michael Hanl <hanl@ids-mannheim.de> 1435338402 +0200

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