user/map/plop.git/doc/Makefile, branch external-merge3

user/map/plop.git/doc/Makefile, branch external-merge3 Magnus' plop repository