merges in git

[Martin Stjernholm, Roxen IS @ Pike developers forum]

But since "/" is already used in branch names in the new pike repo, a
different separator char is probably better. ":", perhaps.