Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches eb283f8f1e update mpd, libvirt, php and openldap 16 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu