Merge proposals dependent on lp://staging/~spiv/launchpad/bmp-inline-diffs

lp://staging/~spiv/launchpad/bmp-inline-diffs has no merge proposals.