Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 rokov pred
..
patches 9ff776e734 update to latest upstream version 13 rokov pred
Makefile f14c1fc551 resolve merge conflict 10 rokov pred