Merge proposals dependent on lp:~mnn282/bzr/auto-rename-fix

lp:~mnn282/bzr/auto-rename-fix has no merge proposals.