Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 rokov pred
..
patches 1ee3ae1f9f update to latest upstream 11 rokov pred
Makefile f14c1fc551 resolve merge conflict 10 rokov pred