Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches bf74f495c3 fix musl compile, update to latest git version 11 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu