Better parsing of hacky diff files as part of gecko migration. r=rail
Merging from default

changeset:   3390:63a9bfd6568c
tag:         tip
parent:      3388:782af6f8590d
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Mon Nov 17 15:06:09 2014 -0500
summary:     Better parsing of hacky diff files as part of gecko migration. r=rail

--HG--
branch : production