Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches 8732b26738 add forked-daapd server and all deps 15 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu