Alexander Brakowski 0bf5507578 fixed merge conflicts 10 gadi atpakaļ
..
informatik 0bf5507578 fixed merge conflicts 10 gadi atpakaļ