Merge proposals dependent on lp:~gz/bzr/2.5_backport_rmbranch_fixes

lp:~gz/bzr/2.5_backport_rmbranch_fixes has no merge proposals.