Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
patches 5da8f2f3aa new package: JOE editor 13 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu