Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 rokov pred
..
files 2d7666cde2 simplify add_rcconf 10 rokov pred
patches b9982ce464 update to latest upstream 10 rokov pred
Makefile f14c1fc551 resolve merge conflict 10 rokov pred