Waldemar Brodkorb d18bf49e2a merge conflict, update hash 9 rokov pred
..
Makefile d18bf49e2a merge conflict, update hash 9 rokov pred