DiffMerge 4.0.0.418
Merge pull request #577 from fanquake/diffmerge-4-0-0-418

DiffMerge 4.0.0.418