Merge proposals dependent on lp://staging/~abentley/bzr/diff

lp://staging/~abentley/bzr/diff has no merge proposals.