Merge proposals dependent on lp:~thumper/launchpad/fix-inline-diff-encoding

lp:~thumper/launchpad/fix-inline-diff-encoding has no merge proposals.