Re: [Fluxus] merging

[Kassen]

Fixed, I think.

Not that bad, really, but some of Gabor's fixes were in areas where I had
tried to simplify things and had to change some indentation. That confused
the auto-merge tool.

Kas.