diffmark license corrected

[Petr Pisar]

I corrected diffmark license from "diffmark and GPLv2+ and (GPL+ or Artistic)"
to "diffmark and (GPL+ or Artistic)".

-- Petr