DiffMerge 4.0.0.367
Merge pull request #508 from fanquake/diffmerge-4-0-0

DiffMerge 4.0.0.367