Fix diff output, now keeps 'added' in 'added' if replaced in later diffs
mergy

Merge branch 'emax' into oe
webjournal happiness