tree b6b5b8271274c6c8cb9b654829aaf203a26dcce0
parent cafa03e8d3b04e5a902bfeabb68355d6f5fe61a6
parent aadf1a2d9d71fb0f15c5d472c51e6f6dd9ba403a
author Michael Hanl <hanl@ids-mannheim.de> 1435335842 +0200
committer Michael Hanl <hanl@ids-mannheim.de> 1435335842 +0200

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