| commit | 57d33655d4cb173c18026b41d0286be22e3df314 | [log] [tgz] |
|---|---|---|
| author | Michael Hanl <hanl@ids-mannheim.de> | Fri Jun 26 19:06:42 2015 +0200 |
| committer | Michael Hanl <hanl@ids-mannheim.de> | Fri Jun 26 19:06:42 2015 +0200 |
| tree | 6e3fc9536f905cf1fa921da6230d38d2ffb2424d | |
| parent | 505f48ccc5192d4fd67a80913ccf88a1ea904ec9 [diff] | |
| parent | abb63d036681a6254a11d10b9ec793e0291f042f [diff] |
Merge branch 'master' of ssh://korap.ids-mannheim.de:29418/private/Kustvakt-core